GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7a53a68850
MOBILISIS-Calculator/library/src/calculator_functions.cpp

3096 lines
154 KiB
C++
Raw Normal View History

dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
#include "calculator_functions.h"
#include "payment_option.h"
#include "utilities.h"
#include "tariff_log.h"
#include "tariff_time_range.h"
Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value.
2023-11-27 16:18:06 +01:00
#include "ticket.h"
GetCostFromDuration(): use new parameter paymentOptionIndex.
2024-04-19 13:31:01 +02:00
#include "tariff_global_defines.h"
Added changes for Schnals
2024-07-19 14:10:07 +02:00
#include "tariff_prepaid.h"
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
#include <sstream>
#include <algorithm>
Use of permitType in several places
2024-07-25 09:49:16 +02:00
#include <optional>
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
#include <QDateTime>
#include <QScopedArrayPointer>
#include <QDebug>
double total_duration_min = 0.0f;
double total_cost = 0.0f;
bool overtime = false;
#ifdef _WIN32
inline struct tm* localtime_r(const time_t *clock, struct tm* result){
if(!clock || !result) return NULL;
memcpy(result,localtime(clock),sizeof(*result));
return result;
}
#endif
QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over)
{
if(!start_datetime.isValid()) {
return QDateTime();
}
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
// qCritical() << __func__ << start_datetime.toString(Qt::ISODate);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
double day_price = 0.0f;
int current_special_day_id = -1;
bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
QDateTime inputDateTime = start_datetime;
QTime worktime_from;
QTime worktime_to;
int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
if(daily_card_price <= 0) {
GetDailyTicketDuration(): replace ZellersAlgorithm by qts build in method dayOfWeek().
2023-12-12 11:34:04 +01:00
qCritical() << "Calculator::GetDailyTicketDuration(): Daily ticket price zero or less";
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
return QDateTime();
}
if(is_special_day)
{
worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str(), Qt::ISODate);
worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str(),Qt::ISODate);
if(inputDateTime.time() < worktime_from) inputDateTime.setTime(worktime_from);
if(carry_over) inputDateTime.setTime(worktime_from);
if(inputDateTime.time() >= worktime_to)
{
// Go to next day if outside worktime
inputDateTime = inputDateTime.addSecs(86400);
return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
}
if(day_price <=0)
{
// Go to next day if special day price is 0
inputDateTime = inputDateTime.addSecs(86400);
return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
}
int diff = abs(inputDateTime.time().secsTo(worktime_to));
inputDateTime = inputDateTime.addSecs(diff);
//qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
return inputDateTime;
}
else
{
// Get day of week
GetDailyTicketDuration(): replace ZellersAlgorithm by qts build in method dayOfWeek().
2023-12-12 11:34:04 +01:00
int const weekdayId = inputDateTime.date().dayOfWeek();
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
// If no working day found, skip it (recursively call method again)
GetDailyTicketDuration(): replace ZellersAlgorithm by qts build in method dayOfWeek().
2023-12-12 11:34:04 +01:00
size_t found = cfg->WeekDaysWorktime.count(weekdayId);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
// When no workday found, go to next available day
if(found <=0)
{
inputDateTime = inputDateTime.addSecs(86400);
return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
}
else
{
worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str(),Qt::ISODate);
worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str(),Qt::ISODate);
if(inputDateTime.time() < worktime_from)
inputDateTime.setTime(worktime_from);
if(carry_over)
inputDateTime.setTime(worktime_from);
if(inputDateTime.time() >= worktime_to)
{
// Go to next day if outside worktime
inputDateTime = inputDateTime.addSecs(86400);
return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
}
int diff = abs(inputDateTime.time().secsTo(worktime_to));
inputDateTime = inputDateTime.addSecs(diff);
save experimental
2024-07-21 20:58:12 +02:00
//qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
return inputDateTime;
}
}
return QDateTime();
}
/// <inheritdoc/>
std::string Calculator::GetDurationFromCost(Configuration* cfg,
uint8_t payment_option,
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
char const *startDatetimePassed, // given in local time
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
double cost,
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
PermitType /*permitType*/,
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
bool nextDay,
bool prepaid)
{
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
Q_UNUSED(payment_option);
Q_UNUSED(nextDay);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
// Get input date
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
QDateTime inputDate = QDateTime::fromString(startDatetimePassed, Qt::ISODate);
Checkin for testing
2024-07-26 17:01:44 +02:00
inputDate.setTime(QTime(inputDate.time().hour(), inputDate.time().minute(), 0));
GetDurationFromCost(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:43:16 +01:00
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
Use free function getPaymentOptionIndex() to compute index of valid payment-option-section in tariff-file based on configured businessHours.
2024-09-02 17:14:20 +02:00
getPaymentOptionIndex(): add start-time parameter
2024-09-06 12:05:41 +02:00
int paymentOptionIndex = getPaymentOptionIndex(*cfg, inputDate);
Use free function getPaymentOptionIndex() to compute index of valid payment-option-section in tariff-file based on configured businessHours.
2024-09-02 17:14:20 +02:00
if (paymentOptionIndex == -1) {
paymentOptionIndex = cfg->getPaymentOptionIndex(QDateTime::fromString(startDatetimePassed, Qt::ISODate));
}
qCritical() << DBG_HEADER << " option index:" << paymentOptionIndex;
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
GetDurationFromCost(): Minor: removed some debug ouput
2024-08-01 16:43:19 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << DBG_HEADER << " start:" << inputDate.toString(Qt::ISODate);
qCritical() << DBG_HEADER << " option index:" << paymentOptionIndex;
qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
qCritical() << DBG_HEADER << " prepaid:" << prepaid;
qCritical() << DBG_HEADER << " cost (price):" << cost;
}
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
QList<int> tsteps = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, inputDate);
GetDurationFromCost(): Minor: removed some debug ouput
2024-08-01 16:43:19 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << DBG_HEADER << " time steps:" << tsteps;
} else {
Q_UNUSED(tsteps);
}
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
if (paymentMethodId == PaymentMethod::Degressive) {
GetDurationFromCost(): Check if given price is below minimal parking price.
2024-07-31 10:25:03 +02:00
if (static_cast<int>(cost) < cfg->getPaymentOptions(paymentOptionIndex).pop_min_price) {
// minimal price is set by GetTimeSteps()
qCritical() << DBG_HEADER << " provided price (cost):" << cost;
qCritical() << DBG_HEADER << "configured minimal price:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
}
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
if (prepaid == false) {
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
// qCritical() << DBG_HEADER << " pop id:" << pop_id;
int price = 0;
int new_price = 0;
int durationInMinutes = 0;
uint32_t duration_previous = 0;
// bool found = false;
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const pra_price = itr->second.pra_price;
int const durationId = itr->second.pra_payment_unit_id;
if (pop_accumulate_prices) {
price += pra_price;
} else {
price = pra_price;
}
getDurationFromCost(): call Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate); for its side-effects. Timesteps will be used in the following calculation.
2024-07-22 15:50:36 +02:00
GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.
2024-08-02 14:34:44 +02:00
// qCritical() << DBG_HEADER << " PRICE" << price << "COST" << cost;
// qCritical() << DBG_HEADER << " duration id" << durationId;
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
// found now the duration in minutes
// check if we are still inside the working-time-range
ATBDuration duration = search->second;
if (pop_accumulate_prices) {
uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
new_price += pra_price;
// qCritical() << "(" << __func__ << ":" << __LINE__ << ") old price" << price << ", new_price:" << new_price;
if (new_price <= cost) {
duration_previous = durationUnit;
if (pop_accumulate_durations) {
durationInMinutes += durationUnit;
}
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") old price" << price << ", new_price:" << new_price;
} else {
//found = true;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.
2024-08-02 14:34:44 +02:00
QDateTime d;
if (pop_accumulate_durations) {
d = inputDate.addSecs(durationInMinutes * 60);
} else {
d = inputDate.addSecs(duration_previous * 60);
}
GetDurationFromCost(): Check if computed duration is below minimal parking time.
2024-07-31 10:26:47 +02:00
qCritical() << DBG_HEADER << " provided price (cost):" << cost;
qCritical() << DBG_HEADER << " computed time for price (minutes):" << duration_previous;
GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.
2024-08-02 14:34:44 +02:00
qCritical() << DBG_HEADER << " minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
GetDurationFromCost(): Check if computed duration is below minimal parking time.
2024-07-31 10:26:47 +02:00
if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
}
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
return d.toString(Qt::ISODate).toStdString();
}
}
getDurationFromCost(): call Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate); for its side-effects. Timesteps will be used in the following calculation.
2024-07-22 15:50:36 +02:00
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
if ((double)price == cost) {
GetDurationFromCost(): Check if computed duration is below minimal parking time.
2024-07-31 10:26:47 +02:00
QDateTime d(inputDate.addSecs(durationInMinutes * 60));
QString const durationStr(d.toString(Qt::ISODate));
qCritical() << DBG_HEADER << " duration in minutes:" << durationInMinutes;
qCritical() << DBG_HEADER << " provided price (cost):" << cost;
qCritical() << DBG_HEADER << " duration for price:" << durationStr;
return durationStr.toStdString();
Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
}
}
}
} else {
qCritical() << DBG_HEADER << " TODO";
}
} else
GetDurationFromCost(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:43:16 +01:00
if (paymentMethodId == PaymentMethod::Steps) {
if (tariffIs24_7(cfg)) {
// use tariff with structure as for instance Schoenau, Koenigsee:
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
GetDurationFromCost(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:43:16 +01:00
return inputDate.toString(Qt::ISODate).toStdString();
} else {
Use isParkingAllowed() to steamline source code.
2024-01-31 15:19:31 +01:00
if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
GetDurationFromCost(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:43:16 +01:00
if (!prepaid) {
Use isParkingAllowed() to steamline source code.
2024-01-31 15:19:31 +01:00
CalcState cs = isParkingAllowed(cfg, inputDate);
if (cs) {
inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
return inputDate.toString(Qt::ISODate).toStdString();
GetDurationFromCost(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:43:16 +01:00
}
}
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
return OVERPAID in case overpay is not allowed
2024-08-21 15:39:05 +02:00
int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
if (cost > pop_max_price) {
qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
return OVERPAID in case overpay is not allowed
2024-08-21 15:39:05 +02:00
if (pop_allow_overpay == false) {
return CalcState::OVERPAID.toStdString();
}
cost = pop_max_price;
// return CalcState::OVERPAID.toStdString();
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
}
if (cost < pop_min_price) {
qCritical() << DBG_HEADER << "MIN-PARKING-PRICE" << pop_min_price << ", COST" << cost;
return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
}
// int const pop_pre_paid = 1;
if (prepaid) {
// no limits on pre-pay-option, i.e. pre-pay-ranges are exactly
// the complements of operational-ranges
// find out if we are in a pre-pay-range.
// in this case, adapt inputDate accordingly.
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
#define DEBUG_GET_DURATION_FROM_COST 0
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "PRE-PAID-OPTION: ADAPT-INPUT-DATE" << inputDate.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
QTime currentTime = inputDate.time();
int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
bool useWeekDaysWorkTimeOfOtherDay = true;
for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_day_in_week_id); iter != rEnd; ++iter) {
QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
GetDurationFromCost(): Minor: removed some debug ouput
2024-08-01 16:43:19 +02:00
//qCritical() << DBG_HEADER << "from" << pwd_time_from.toString(Qt::ISODate);
//qCritical() << DBG_HEADER << " to" << pwd_time_to.toString(Qt::ISODate);
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
if (inputDate.time() < pwd_time_from) {
inputDate.setTime(pwd_time_from);
useWeekDaysWorkTimeOfOtherDay = false;
break;
}
if (currentTime <= pwd_time_to) {
useWeekDaysWorkTimeOfOtherDay = false;
break;
}
}
if (useWeekDaysWorkTimeOfOtherDay) {// for the current day, we are above
// the latest worktime-range -> find the next valid range
QTime pwd_time_from_next_valid_range(0, 0, 0);
int pwd_period_next_day_in_week_id = pwd_period_day_in_week_id;
for (int days = 1; days < 8; ++days) {
pwd_period_next_day_in_week_id += 1;
if (pwd_period_next_day_in_week_id > (int)Qt::Sunday) {
pwd_period_next_day_in_week_id = Qt::Monday;
}
if (cfg->WeekDaysWorktime.count(pwd_period_next_day_in_week_id) > 0) {
for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_next_day_in_week_id); iter != rEnd; ++iter) {
QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
if (pwd_time_from_next_valid_range < pwd_time_from) {
pwd_time_from_next_valid_range = pwd_time_from;
break;
}
}
inputDate = inputDate.addDays(days);
inputDate.setTime(pwd_time_from_next_valid_range);
break;
}
}
}
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
} else {
qCritical() << "(" << __func__ << ":" << __LINE__ << "no prepaid";
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
}
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "(ADAPTED) INPUT-DATE" << inputDate.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << __func__ << __LINE__;
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
// inputDate is now located in a valid operational-working-range
// find this working-time-range
int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << __func__ << __LINE__ << pwd_period_day_in_week_id;
//qCritical() << __func__ << __LINE__ << cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id);
Checkin for testing
2024-07-26 17:01:44 +02:00
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
if (cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id) == 0) {
qCritical() << DBG_HEADER
<< "ERROR" << inputDate.toString(Qt::ISODate)
<< "NOT IN VALID WORKING TIME-RANGE";
return "";
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << __func__ << __LINE__;
Checkin for testing
2024-07-26 17:01:44 +02:00
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
QTime current_working_time_from;
QTime current_working_time_to;
for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_day_in_week_id); iter != rEnd; ++iter) {
QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
Checkin for testing
2024-07-26 17:01:44 +02:00
//qCritical() << __func__ << pwd_time_from.toString(Qt::ISODate);
//qCritical() << __func__ << pwd_time_to.toString(Qt::ISODate);
//qCritical() << __func__ << inputDate.toString(Qt::ISODate);
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
if (pwd_time_from <= inputDate.time() && inputDate.time() <= pwd_time_to) {
current_working_time_from = pwd_time_from;
current_working_time_to = pwd_time_to;
}
}
if (current_working_time_from.isNull() || current_working_time_to.isNull()) {
// can never happen
qCritical() << DBG_HEADER
<< "ERROR" << inputDate.toString(Qt::ISODate)
<< "NOT IN VALID WORKING TIME-RANGE";
return "";
}
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "CURRENT WORKING-TIME-FROM" << current_working_time_from.toString(Qt::ISODate);
qCritical() << DBG_HEADER << " CURRENT WORKING-TIME-TO" << current_working_time_to.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
Use of permitType in several places
2024-07-25 09:49:16 +02:00
// int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
int price = 0;
Checkin for testing
2024-07-26 17:01:44 +02:00
int new_price = 0;
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
int durationInSecs = 0;
Checkin for testing
2024-07-26 17:01:44 +02:00
uint32_t duration_previous = 0;
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
// bool found = false;
Checkin for testing
2024-07-26 17:01:44 +02:00
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const pra_price = itr->second.pra_price;
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
int const durationId = itr->second.pra_payment_unit_id;
if (pop_accumulate_prices) {
price += pra_price;
} else {
price = pra_price;
}
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
// qCritical() << DBG_HEADER << " PRICE" << price << "COST" << cost;
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
// found now the duration in minutes
// check if we are still inside the working-time-range
ATBDuration duration = search->second;
Checkin for testing
2024-07-26 17:01:44 +02:00
if (pop_accumulate_prices) {
uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
new_price += pra_price;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") XXXXXX price:" << price;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") YYYYYY new_price:" << new_price;
Checkin for testing
2024-07-26 17:01:44 +02:00
if (new_price <= cost) {
duration_previous = durationUnit;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") ZZZZZZ duration_previous" << duration_previous;
Checkin for testing
2024-07-26 17:01:44 +02:00
} else {
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
//found = true;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") WWWWWW duration_previous" << duration_previous;
Checkin for testing
2024-07-26 17:01:44 +02:00
QString s = inputDate.toString(Qt::ISODate);
QDateTime d(QDateTime::fromString(s, Qt::ISODate));
d = d.addSecs(duration_previous * 60);
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << DBG_HEADER << "XXXXXXXXXXXXXXXXXXXXX" << d;
Checkin for testing
2024-07-26 17:01:44 +02:00
return d.toString(Qt::ISODate).toStdString();
}
GetDurationFromCost(): Set durationInSecs in case 'pop_accumulate_prices' is not configured in tariff file.
2024-08-01 16:44:06 +02:00
} else {
durationInSecs = cfg->Duration.find(durationId)->second.pun_duration * 60;
//qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
//qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
Checkin for testing
2024-07-26 17:01:44 +02:00
}
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
if ((double)price == cost) {
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
QDateTime current_working_date_time_to = inputDate;
current_working_date_time_to.setTime(current_working_time_to);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
qCritical() << DBG_HEADER << " DURATION ID" << duration.pun_id;
qCritical() << DBG_HEADER << "DURATION IN MINUTES" << durationInSecs / 60;
qCritical() << DBG_HEADER << "DURATION IN SECONDS" << durationInSecs;
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "CURRENT-WORKING-DATE-TIME-TO"
<< current_working_date_time_to.toString(Qt::ISODate);
qCritical() << DBG_HEADER << "NEW INPUT DATE" << inputDate.addSecs(durationInSecs).toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
if (inputDate.addSecs(durationInSecs) > current_working_date_time_to) {
QTime next_working_time_from;
if (cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over != 0) {
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "CARRY-OVER SET";
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
// check for next working-time-range on same day
int day_in_week_id = inputDate.date().dayOfWeek();
for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(day_in_week_id); iter != rEnd; ++iter) {
QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
if (pwd_time_from > current_working_time_to) {
next_working_time_from = pwd_time_from;
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "NEXT-WORKING-TIME-FROM"
<< next_working_time_from.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
break;
}
}
// check for next working-time-range on following day(s)
if (next_working_time_from.isNull()) {
next_working_time_from = QTime(0, 0, 0);
for (int days = 1; days < 8; ++days) {
day_in_week_id += 1;
if (day_in_week_id > (int)Qt::Sunday) {
day_in_week_id = Qt::Monday;
}
if (cfg->WeekDaysWorktime.count(day_in_week_id) > 0) {
for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(day_in_week_id); iter != rEnd; ++iter) {
QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
if (next_working_time_from < pwd_time_from) {
next_working_time_from = pwd_time_from;
GetDurationFromCost(): Minor: removed some debug ouput
2024-08-01 16:43:19 +02:00
qCritical() << DBG_HEADER << "next working time from" << next_working_time_from.toString(Qt::ISODate);
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
break;
}
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << DBG_HEADER << "DAYS" << days;
//qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
//qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
Checkin for testing
2024-07-26 17:01:44 +02:00
Fix: GetDurationFromCost() -> set inputDate if next valid working time-range in on another day and break the loop iterating through next days.
2024-06-06 14:04:04 +02:00
QDateTime upper = inputDate.addDays(days);
upper.setTime(next_working_time_from);
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << DBG_HEADER << "UPPER" << upper.toString(Qt::ISODate);
Checkin for testing
2024-07-26 17:01:44 +02:00
Fix: GetDurationFromCost() -> set inputDate if next valid working time-range in on another day and break the loop iterating through next days.
2024-06-06 14:04:04 +02:00
QDateTime lower = inputDate;
lower.setTime(current_working_time_to);
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << DBG_HEADER << "LOWER" << lower.toString(Qt::ISODate);
Checkin for testing
2024-07-26 17:01:44 +02:00
remove input correction
2024-07-26 17:34:24 +02:00
// inputDate = inputDate.addSecs(lower.secsTo(upper));
Checkin for testing
2024-07-26 17:01:44 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);
Checkin for testing
2024-07-26 17:01:44 +02:00
inputDate = inputDate.addSecs(durationInSecs);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
#endif
break;
}
} // for (int days = 1; days < 8; ++days) {
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
} else { // next working-time is on same day
QDateTime upper = inputDate;
upper.setTime(next_working_time_from);
QDateTime lower = inputDate;
lower.setTime(current_working_time_to);
inputDate = inputDate.addSecs(lower.secsTo(upper) + durationInSecs);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
}
}
} else {
inputDate = inputDate.addSecs(duration.pun_duration * 60);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "INPUT-DATE" << inputDate.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
}
QString const &s = inputDate.toString(Qt::ISODate);
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#if DEBUG_GET_DURATION_FROM_COST==1
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
qCritical() << DBG_HEADER << "TICKET-END" << s;
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
#endif
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
return s.toStdString();
GetDurationFromCost(): expanded. still to be tested.
2024-07-22 15:53:27 +02:00
} // if ((double)price == cost) {
Checkin for testing
2024-07-26 17:01:44 +02:00
else {
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << DBG_HEADER;
Checkin for testing
2024-07-26 17:01:44 +02:00
}
} else {
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << __func__ << __LINE__;
Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748).
2024-06-05 17:00:27 +02:00
}
}
Use isParkingAllowed() to steamline source code.
2024-01-31 15:19:31 +01:00
return "";
GetDurationFromCost(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:43:16 +01:00
}
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
} else
if (paymentMethodId == PaymentMethod::Progressive) {
// started with Neuhauser, Kirchdorf: merge into main algo. later
// for now try out some ideas
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
// started with Neuhauser, Kirchdorf: merge into main algo. later
// for now try out some ideas
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
static const bool carryOverNotSet = Utilities::isCarryOverNotSet(cfg, paymentMethodId);
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
static const uint minParkingPrice = Utilities::getMinimalParkingPrice(cfg, paymentMethodId);
GetDurationFromCost(): add some sanity checks for cost. Check if cost < minParkingPrice. Cut cost internally to maxParkingPrice if cost > maxParkingPrice.
2024-02-20 13:47:45 +01:00
static const uint maxParkingPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
if (cost < minParkingPrice) {
qCritical() << QString("ERROR: COST < MIN_PARKING_PRICE (%1 < %2)").arg(cost).arg(minParkingPrice);
return QDateTime().toString(Qt::ISODate).toStdString();
}
if (cost > maxParkingPrice) {
qCritical() << QString("WARN: COST > MAX_PARKING_PRICE (%1 > %2)").arg(cost).arg(maxParkingPrice);
cost = maxParkingPrice;
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
Q_ASSERT_X(carryOverNotSet, __func__, "CARRYOVER SET (FOR KIRCHDORF)");
Q_ASSERT_X(prepaid, __func__, "PREPAID NOT SET (FOR KIRCHDORF)");
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
QDateTime start_datetime = QDateTime::fromString(QString(startDatetimePassed), Qt::ISODate);
QDateTime start = start_datetime;
QDateTime end_datetime = QDateTime();
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
int weekdayId = -1;
int weekdayIdLast = -1;
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
int durationMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
int durationMinutesBrutto = 0;
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#ifdef _DEBUG_
#undef _DEBUG_
#endif
//#define _DEBUG_ 1
#define _DEBUG_ 0
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
QDateTime current = start;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
int days = 7;
while (--days > 0) {
weekdayId = current.date().dayOfWeek();
weekdayIdLast = weekdayId; // TODO: some end condition in json-file
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
current = current.addDays(1);
weekdayId = current.date().dayOfWeek();
if (weekdayId == weekdayIdLast) {
qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
return QDateTime().toString(Qt::ISODate).toStdString();
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
}
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
QTime to = QTime(0, 0, 0);
for (WTIterator itr = p.first; itr != p.second; ++itr) {
QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);
if (to < t) {
to = t;
}
}
if (current.time() >= to) {
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
if (carryOverNotSet) {
return end_datetime.toString(Qt::ISODate).toStdString();
} else {
QDateTime const dt = start;
start = start.addDays(1);
start.setTime(QTime(0, 0, 0));
durationMinutesBrutto += dt.secsTo(start) / 60;
current = start;
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
} else {
break;
}
}
int durationMinutesNetto = 0;
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
uint price = 0;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
if (carryOverNotSet) {
int minsToCarryOver = 0; // from one work-time to the other on the same day
Synced GetDurationFromCost() with GetCostFromDuration()
2024-02-21 14:53:06 +01:00
int minsUsed = 0;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
QDateTime lastCurrent = QDateTime();
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
QVector<ATBWeekDaysWorktime> weekDayWorkTimeRanges;
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) {
weekDayWorkTimeRanges.append(itr->second); // working with vector is easier
}
int weekDayWorkTimeIndex = 0;
bool moveToNextTimeRange = false;
// time ranges for Neuhauser-Kirchdorf (743): 30, 5, 5, ... 5
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
auto timeRangeIt = cfg->TimeRange.cbegin();
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "weekDayWorkTimeRanges.size()" << weekDayWorkTimeRanges.size()
<< "price" << price;
#endif
end_datetime = current;
return end_datetime.toString(Qt::ISODate).toStdString();
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
QTime const &from = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_from.c_str(), Qt::ISODate);
QTime const &to = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_to.c_str(), Qt::ISODate);
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "from" << from.toString(Qt::ISODate)
<< "to" << to.toString(Qt::ISODate);
#endif
Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
if (current.time() >= to) {
++weekDayWorkTimeIndex;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "try to use next available work-time with"
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "price" << price;
#endif
// time range is not affected
continue;
} else
if (current.time() <= from) {
if (prepaid) {
lastCurrent = current;
current.setTime(from); // move current forward (range==1),
// as prepaid is set
uint const minutesMoved = lastCurrent.secsTo(current) / 60;
durationMinutesBrutto += minutesMoved;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "lastCurrent" << lastCurrent.toString(Qt::ISODate)
<< "current" << current.toString(Qt::ISODate)
<< "minutesMoved" << minutesMoved
<< "durationMinutesBrutto" << durationMinutesBrutto;
#endif
if (weekDayWorkTimeIndex == 0) {
start_datetime = current;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
ATBTimeRange timeRange = timeRangeIt->second;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
timeRange.computeQTimes(current.time());
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
int duration = timeRange.time_range_to_in_minutes_from_start -
timeRange.time_range_from_in_minutes_from_start;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "price" << price;
#endif
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
if (minsToCarryOver > 0) { // the price for this time range
// has been is paid already
Q_ASSERT_X(weekDayWorkTimeIndex > 0, __func__, "WRONG-WORK-TIME");
current = current.addSecs(minsToCarryOver*60);
durationMinutes -= minsToCarryOver;
durationMinutesNetto += minsToCarryOver;
durationMinutesBrutto += minsToCarryOver;
minsToCarryOver = 0;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "durationMinutes" << durationMinutes
<< "durationMinutesNetto" << durationMinutesNetto
<< "durationMinutesBrutto" << durationMinutesBrutto
<< "price" << price;
#endif
if (price >= cost) {
end_datetime = current;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
return end_datetime.toString(Qt::ISODate).toStdString();
}
}
if (current.addSecs(duration * 60).time() <= to) {
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes;
#endif
moveToNextTimeRange = false;
for(const auto &x: cfg->PaymentRate) {
ATBPaymentRate const rate = x.second;
if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
price += (uint)rate.pra_price;
if (price >= maxParkingPrice) {
price = maxParkingPrice;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
durationMinutes -= duration;
durationMinutesNetto += duration;
durationMinutesBrutto += duration;
current = current.addSecs(duration * 60);
if (price >= cost) {
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
end_datetime = current;
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
return end_datetime.toString(Qt::ISODate).toStdString();
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
// price has been updated; use next time range
moveToNextTimeRange = true;
break;
}
}
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "price" << price
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes
<< "durationMinutesNetto" << durationMinutesNetto
<< "durationMinutesBrutto" << durationMinutesBrutto;
#endif
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
if (price >= cost) {
end_datetime = current;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
return end_datetime.toString(Qt::ISODate).toStdString();
}
if (moveToNextTimeRange) {
if (++timeRangeIt != cfg->TimeRange.cend()) {
continue;
}
}
// havin a new time range means that we always have a new
// work-time-range
// ++timeRangeIt;
} else { // current.addSecs(duration * 60).time() > to
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
<< "duration" << duration
<< ", to:" << to.toString(Qt::ISODate);
#endif
lastCurrent = current;
current.setTime(to);
minsUsed = lastCurrent.secsTo(current) / 60;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "lastCurrent" << lastCurrent.toString(Qt::ISODate)
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes;
#endif
// mod duration: possibly discard some minutes in
// the next time-range
if (duration >= minsUsed) {
minsToCarryOver = duration - minsUsed;
}
durationMinutes -= minsUsed;
durationMinutesNetto += minsUsed;
durationMinutesBrutto += minsUsed;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "lastCurrent" << lastCurrent.toString(Qt::ISODate)
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes
<< "price" << price;
#endif
moveToNextTimeRange = false;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
if (minsUsed > 0) {
for(const auto &x: cfg->PaymentRate) {
ATBPaymentRate const rate = x.second;
if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
price += (uint)rate.pra_price;
if (price >= maxParkingPrice) {
price = maxParkingPrice;
}
if (price >= cost) {
end_datetime = current;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
// return end_datetime.toString(Qt::ISODate).toStdString();
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
// price has been updated; use next time range
moveToNextTimeRange = true;
break;
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
}
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "minsUsed" << minsUsed
<< "durationMinutes" << durationMinutes
<< "moveToNextTimeRange" << moveToNextTimeRange
<< "price" << price;
#endif
if (moveToNextTimeRange) {
if (++timeRangeIt != cfg->TimeRange.cend()) {
continue;
}
// no valid time range left
end_datetime = current;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
return end_datetime.toString(Qt::ISODate).toStdString();
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
end_datetime = start.addSecs(durationMinutesBrutto * 60);
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "start" << start.toString(Qt::ISODate)
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "final price" << std::max(price, minParkingPrice);
#endif
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
return end_datetime.toString(Qt::ISODate).toStdString();
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
} // while (timeRangeIt != cfg->TimeRange.cend()) {
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "INVALID END TIME";
#endif
GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
end_datetime = QDateTime();
return end_datetime.toString(Qt::ISODate).toStdString();
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
// qCritical().noquote() << t;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
// TODO: im fehlerfall
return t.getValidUntil().toString(Qt::ISODate).toStdString();
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#undef _DEBUG_
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
///////////////////////////////////////
/// <inheritdoc/>
///
uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
QDateTime const &start,
GetCostFromDuration(): use new parameter paymentOptionIndex.
2024-04-19 13:31:01 +02:00
quint64 timeStepInMinutes,
int paymentOptionIndex) const {
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
// for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
// special days, nonstop.
Minor: change debug output
2024-07-29 17:26:26 +02:00
//qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
Private GetCostFromDuration() and GetCostFromDuration() helpers: Use pyament method id (=4) as condition for if(...). The other condition (tariffIs24_7()) is used in calling functions.
2023-12-12 10:49:51 +01:00
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
if (paymentMethodId == PaymentMethod::Steps ||
paymentMethodId == PaymentMethod::Degressive) {
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
QDateTime const end = start.addSecs(timeStepInMinutes*60);
GetCostFromDuration(): use new parameter paymentOptionIndex.
2024-04-19 13:31:01 +02:00
return GetCostFromDuration(cfg, start, end, paymentOptionIndex);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
return 0;
}
uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
QDateTime const &start,
GetCostFromDuration(): use new parameter paymentOptionIndex.
2024-04-19 13:31:01 +02:00
QDateTime const &end,
int paymentOptionIndex) const {
Private GetCostFromDuration() and GetCostFromDuration() helpers: Use pyament method id (=4) as condition for if(...). The other condition (tariffIs24_7()) is used in calling functions.
2023-12-12 10:49:51 +01:00
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
Minor: change debug output
2024-07-29 17:26:26 +02:00
//qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
if (paymentMethodId == PaymentMethod::Steps ||
paymentMethodId == PaymentMethod::Degressive) {
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
int const timeStepInMinutes = start.secsTo(end) / 60;
GetCostFromDuration(): recompute timestep list to make sure that time step is found in it.
2024-08-02 11:11:20 +02:00
QList<int> tlist = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, start);
qCritical() << DBG_HEADER << "timeStepList" << timeStepInMinutes << tlist;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);
GetCostFromDuration(): use new parameter paymentOptionIndex.
2024-04-19 13:31:01 +02:00
return GetPriceForTimeStep(cfg, timeStepInMinutes, paymentOptionIndex);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
return 0;
}
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
QDateTime const &start,
int netto_parking_time,
int paymentOptionIndex) {
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Minor: change debug output
2024-07-29 17:26:26 +02:00
//qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
// << "paymentOptionIndex" << paymentOptionIndex;
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
IMPORTANT: isParkingAllowedForWeekDay(): deactivated for testing !!!
2024-07-24 12:30:46 +02:00
// TODO: wieder entfernen
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", QTime(), QTime());
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
QString errorStr = "UNKNOWN ERROR";
PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
if (paymentMethodId == PaymentMethod::Steps) {
uint64_t const businessHours = cfg->getPaymentOptions(paymentOptionIndex).pop_business_hours;
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (cfg->isDayIncluded(businessHours, start)) {
if (businessHours == BusinessHours::NO_RESTRICTION_24_7) {
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
QTime(0, 0, 0), QTime(23, 59, 59));
}
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
int const weekdayId = start.date().dayOfWeek();
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
// qCritical() << DBG_HEADER
// << "weekdayId" << weekdayId
// << "count" << cfg->WeekDaysWorktime.count(weekdayId);
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
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);
qCritical() << DBG_HEADER
<< "CHECK IF PARKING IS ALLOWED IN TIME-RANGE ("
<< from.toString(Qt::ISODate) << "->" << until.toString(Qt::ISODate) << ") ...";
QTime const &startTime = start.time();
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
// qCritical() << DBG_HEADER << "START TIME" << startTime.toString(Qt::ISODate);
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (startTime >= from && startTime <= until) {
Fix: Check if endTime is still on the same day.
2024-05-07 15:01:16 +02:00
QDateTime const end = start.addSecs(netto_parking_time*60);
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
//qCritical() << DBG_HEADER << "END-DATE-TIME" << end.toString(Qt::ISODate);
Fix: Check if endTime is still on the same day.
2024-05-07 15:01:16 +02:00
QTime const endTime = end.time();
if (endTime <= until && start.date().dayOfWeek() == end.date().dayOfWeek()) {
qCritical() << DBG_HEADER;
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", from, until);
} else {
errorStr = QString("%1 startTime not in range (%2 not in [%3, %4))")
.arg(__LINE__)
.arg(startTime.toString(Qt::ISODate))
.arg(from.toString(Qt::ISODate))
.arg(endTime.toString(Qt::ISODate));
}
} else {
errorStr = QString("%1 startTime not in range (%2 not in [%3, %4))")
.arg(__LINE__)
.arg(startTime.toString(Qt::ISODate))
.arg(from.toString(Qt::ISODate))
.arg(until.toString(Qt::ISODate));
}
int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
// qCritical() << DBG_HEADER
// << "paymentOptionIndex" << paymentOptionIndex
// << "pop_carry_over" << pop_carry_over;
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (pop_carry_over == 1) {
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
// qCritical() << DBG_HEADER
// << "NO. CHECK IF PARKING IS ALLOWED WITH CARRY-OVER ...";
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
int const pop_carry_over_start_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_start_time_range;
int const pop_carry_over_end_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_end_time_range;
Fix: Handle case if "pop_carry_over_start_time_range" and "pop_carry_over_end_time_range" is not given in tariff file.
2024-06-04 11:19:39 +02:00
// qCritical() << DBG_HEADER
// << "pop_carry_over_start_time_range" << pop_carry_over_start_time_range
// << "pop_carry_over_end_time_range" << pop_carry_over_end_time_range;
if ((int)cfg->TimeRange.count(pop_carry_over_start_time_range) <= 0 &&
(int)cfg->TimeRange.count(pop_carry_over_end_time_range) <= 0) {
qCritical() << DBG_HEADER << "PARKING_ALLOWED. startTime" << startTime.toString(Qt::ISODate);
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", startTime);
} else
// search entry in time-range-field of tariff-file
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (cfg->TimeRange.count(pop_carry_over_start_time_range) == 1 &&
cfg->TimeRange.count(pop_carry_over_end_time_range) == 1) {
ATBTimeRange s = cfg->TimeRange.find(pop_carry_over_start_time_range)->second;
ATBTimeRange e = cfg->TimeRange.find(pop_carry_over_end_time_range)->second;
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
//qCritical() << DBG_HEADER << "startTime" << startTime.toString(Qt::ISODate);
//qCritical() << DBG_HEADER << "s: time range from" << s.getTimeFrom().toString(Qt::ISODate);
//qCritical() << DBG_HEADER << "s: time range until" << s.getTimeUntil().toString(Qt::ISODate);
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (startTime >= s.getTimeFrom() && startTime <= s.getTimeUntil()) {
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
QDateTime sd = start;
sd.setTime(s.getTimeUntil());
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
//qCritical() << DBG_HEADER << "jumpFrom" << sd.toString(Qt::ISODate);
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
QDateTime ed = start.addDays(1);
ed.setTime(e.getTimeFrom());
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
//qCritical() << DBG_HEADER << "to" << ed.toString(Qt::ISODate);
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
int const jumpSecs = sd.secsTo(ed);
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
//qCritical() << DBG_HEADER << "jumpSecs" << jumpSecs;
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
QDateTime const end = start.addSecs(netto_parking_time*60 + jumpSecs);
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
//qCritical() << DBG_HEADER << "new end" << end.toString(Qt::ISODate);
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
if (end.time() <= e.getTimeUntil()) {
qCritical() << DBG_HEADER
<< "PARKING IS ALLOWED WITH CARRY-OVER ("
<< start.toString(Qt::ISODate) << "->" << ed.toString(Qt::ISODate) << ")";
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
startTime, end.time());
} else {
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
errorStr = QString("endTime %1 outside [%2, %3))")
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
.arg(end.toString(Qt::ISODate))
.arg(sd.toString(Qt::ISODate))
.arg(ed.toString(Qt::ISODate));
}
} else {
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
errorStr = QString("startTime %1 outside [%2, %3))")
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
.arg(startTime.toString(Qt::ISODate))
.arg(s.getTimeFrom().toString(Qt::ISODate))
.arg(s.getTimeUntil().toString(Qt::ISODate));
}
} else {
errorStr = "no carry-over limits configured";
}
} else {
errorStr = "no carry-over configured";
}
}
} else {
errorStr = QString("no weekday configured for day-id %1").arg(weekdayId);
}
} else {
errorStr = QString("start %1 not contained in business hours %2")
.arg(start.toString(Qt::ISODate))
.arg(businessHours);
}
}
Minor: Add some (commented-out) debug messages.
2024-06-04 11:18:00 +02:00
qCritical() << DBG_HEADER << "errorStr" << errorStr;
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, errorStr,
QTime(), QTime());
}
CalcState Calculator::isParkingAllowedForSpecialDay(Configuration const *cfg,
QDateTime const &start,
int netto_parking_time,
int paymentOptionIndex) {
QString errorStr = "UNKNOWN ERROR";
qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
<< "paymentOptionIndex" << paymentOptionIndex;
PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
if (paymentMethodId == PaymentMethod::Steps) {
//uint64_t const businessHours = cfg->getPaymentOptions(paymentOptionIndex).pop_business_hours;
int const specialDayId = cfg->specialDayId(start);
if ((specialDayId > 0) && (cfg->SpecialDaysWorktime.count(specialDayId) > 0)) {
using SDIterator = Configuration::SpecialDaysWorktimeType::const_iterator;
std::pair<SDIterator, SDIterator> p = cfg->SpecialDaysWorktime.equal_range(specialDayId);
for (SDIterator it = p.first; it != p.second; ++it) {
QTime const &from = Utilities::SpecialDaysWorkTimeFrom(it);
QTime const &until = Utilities::SpecialDaysWorkTimeUntil(it);
qCritical() << DBG_HEADER
<< "CHECK IF PARKING IS ALLOWED IN TIME-RANGE ("
<< from.toString(Qt::ISODate) << "->" << until.toString(Qt::ISODate) << ") ...";
QTime const &startTime = start.time();
if (startTime >= from && startTime <= until) {
QTime const endTime = start.addSecs(netto_parking_time*60).time();
if (endTime <= until) {
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", from, until);
} else {
errorStr = QString("%1 startTime not in range (%2 not in [%3, %4))")
.arg(__LINE__)
.arg(startTime.toString(Qt::ISODate))
.arg(from.toString(Qt::ISODate))
.arg(endTime.toString(Qt::ISODate));
}
} else {
errorStr = QString("%1 startTime not in range (%2 not in [%3, %4))")
.arg(__LINE__)
.arg(startTime.toString(Qt::ISODate))
.arg(from.toString(Qt::ISODate))
.arg(until.toString(Qt::ISODate));
}
int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
if (pop_carry_over == 1) {
qCritical() << DBG_HEADER << "NO. CHECK IF PARKING IS ALLOWED WITH CARRY-OVER ...";
int const pop_carry_over_start_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_start_time_range;
int const pop_carry_over_end_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_end_time_range;
if (cfg->TimeRange.count(pop_carry_over_start_time_range) == 1 &&
cfg->TimeRange.count(pop_carry_over_end_time_range) == 1) {
ATBTimeRange s = cfg->TimeRange.find(pop_carry_over_start_time_range)->second;
ATBTimeRange e = cfg->TimeRange.find(pop_carry_over_end_time_range)->second;
if (startTime >= s.getTimeFrom() && startTime <= s.getTimeUntil()) {
QDateTime sd = start;
sd.setTime(s.getTimeUntil());
QDateTime ed = start.addDays(1);
ed.setTime(e.getTimeFrom());
int const jumpSecs = sd.secsTo(ed);
QDateTime const end = start.addSecs(netto_parking_time*60 + jumpSecs);
if (end.time() <= e.getTimeUntil()) {
ed.setTime(e.getTimeUntil()); // for printing
qCritical() << DBG_HEADER
<< "PARKING IS ALLOWED WITH CARRY-OVER ("
<< start.toString(Qt::ISODate) << "->" << ed.toString(Qt::ISODate) << ")";
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
startTime, end.time());
} else {
ed.setTime(e.getTimeUntil()); // for printing
errorStr = QString("endTime %1 exceeds [%2, %3))")
.arg(end.toString(Qt::ISODate))
.arg(sd.toString(Qt::ISODate))
.arg(ed.toString(Qt::ISODate));
}
} else {
errorStr = QString("startTime %1 exceeds [%2, %3))")
.arg(startTime.toString(Qt::ISODate))
.arg(s.getTimeFrom().toString(Qt::ISODate))
.arg(s.getTimeUntil().toString(Qt::ISODate));
}
} else {
errorStr = "no carry-over limits configured";
}
} else {
errorStr = "no carry-over configured";
}
}
}
}
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, errorStr,
QTime(), QTime());
}
CalcState Calculator::isParkingAllowed(Configuration const *cfg,
QDateTime const &start,
int netto_parking_time,
int paymentOptionIndex) {
qCritical() << DBG_HEADER << "CHECK IF PARKING IS ALLOWED AT"
<< start.toString(Qt::ISODate) << "...";
CalcState cs;
if ((cs = isParkingAllowedForWeekDay(cfg, start, netto_parking_time, paymentOptionIndex))) {
return cs;
}
qCritical() << DBG_HEADER << QString(cs);
if ((cs = isParkingAllowedForSpecialDay(cfg, start, netto_parking_time, paymentOptionIndex))) {
return cs;
}
qCritical() << DBG_HEADER << QString(cs);
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, "UNKNOWN ERROR",
QTime(), QTime());
}
CalcState Calculator::isParkingAllowed(Configuration const *cfg,
QDateTime const &start) {
Implemement isParkingAllowed().
2024-01-31 15:19:01 +01:00
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
if (paymentMethodId == PaymentMethod::Steps) {
int const weekdayId = start.date().dayOfWeek();
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
Add case for BusinessHours::NoRestriction_24_7: used for Neuhauder-Christoph-Reisen
2024-04-16 12:05:55 +02:00
if (businessHours == BusinessHours::NoRestriction_24_7) {
return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
QTime(0, 0, 0), QTime(23, 59, 59));
} else
Implemement isParkingAllowed().
2024-01-31 15:19:01 +01:00
if (businessHours == BusinessHours::OnlyWeekDays) {
if (weekdayId != (int)Qt::Saturday && weekdayId != (int)Qt::Sunday) { // e.g. Neuhauser, Linsinger Maschinenbau (741)
if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
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.time();
if (from > startTime) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 < %2").arg(from.toString(Qt::ISODate))
.arg(startTime.toString(Qt::ISODate)), from, until);
} else
if (startTime >= until) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 >= %2").arg(startTime.toString(Qt::ISODate))
.arg(until.toString(Qt::ISODate)), from, until);
}
return CalcState(CalcState::State::SUCCESS,
"PARKING ALLOWED", from, until);
}
}
}
} else
if (businessHours == BusinessHours::AllDaysWithRestrictedHours) { // e.g. for Neuhauser, NAZ (744)
if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
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.time();
if (from > startTime) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 < %2").arg(from.toString(Qt::ISODate))
.arg(startTime.toString(Qt::ISODate)), from, until);
} else
if (startTime >= until) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 >= %2").arg(startTime.toString(Qt::ISODate))
.arg(until.toString(Qt::ISODate)), from, until);
}
return CalcState(CalcState::State::SUCCESS,
"PARKING ALLOWED", from, until);
}
}
}
}
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, "UNKNOWN ERROR",
QTime(), QTime());
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
///////////////////////////////////////
/// <inheritdoc/>
double Calculator::GetCostFromDuration(Configuration* cfg,
uint8_t payment_option,
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
QDateTime &start_datetime,
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
QDateTime &end_datetime,
int durationMinutes,
Use of permitType in several places
2024-07-25 09:49:16 +02:00
PermitType permitType,
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
bool nextDay,
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
bool prepaid) {
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
Q_UNUSED(payment_option);
Q_UNUSED(nextDay);
getPaymentOptionIndex(): add start-time parameter
2024-09-06 12:05:41 +02:00
int paymentOptionIndex = getPaymentOptionIndex(*cfg, start_datetime);
Use free function getPaymentOptionIndex() to compute index of valid payment-option-section in tariff-file based on configured businessHours.
2024-09-02 17:14:20 +02:00
if (paymentOptionIndex == -1) {
paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
}
GetCostFromDuration(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:52:16 +01:00
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
if (paymentMethodId == PaymentMethod::Steps) {
if (tariffIs24_7(cfg)) {
end_datetime = start_datetime.addSecs(durationMinutes*60);
Use of permitType in several places
2024-07-25 09:49:16 +02:00
return GetCostFromDuration(cfg, start_datetime, end_datetime, paymentOptionIndex);
GetCostFromDuration(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:52:16 +01:00
} else {
if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
if (!prepaid) {
Use isParkingAllowed() to steamline source code.
2024-01-31 15:19:31 +01:00
CalcState cs = isParkingAllowed(cfg, start_datetime);
if (cs) {
end_datetime = start_datetime.addSecs(durationMinutes*60);
Use of permitType in several places
2024-07-25 09:49:16 +02:00
double cost = GetCostFromDuration(cfg, start_datetime, end_datetime, paymentOptionIndex);
Use isParkingAllowed() to steamline source code.
2024-01-31 15:19:31 +01:00
end_datetime = start_datetime;
end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
return cost;
GetCostFromDuration(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:52:16 +01:00
}
GetDurationFromCost(): aded section if prepaid is not set. E.g. for Linsinger Maschinenbau (Neuhauser, 741): here, the buying of food stamps is obviously only possible at certain times.
2024-02-22 09:31:41 +01:00
} else {
// it might be that in such a case even prepaid ("vorkauf")
// is not allowed at any moment
GetCostFromDuration(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:52:16 +01:00
}
GetDurationFromCost(): reverted, as there is a new default parameter (prepaid) in compute_price_for_parming_ticket().
2024-02-22 09:43:04 +01:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
GetCostFromDuration(): 1: Get payment method from tariff file. 2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case) 3: Add new code for neuhauser/linsinger maschinenbau: Very similar to Schoenau, but here there are extra operating times 6.00-18.00 during the week, 6-12 on Saturday. Check if the current time is inside such time ranges and return associated price.
2023-12-12 10:52:16 +01:00
end_datetime = QDateTime();
return 0;
}
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
} else
if (paymentMethodId == PaymentMethod::Progressive) {
// started with Neuhauser, Kirchdorf: merge into main algo. later
// for now try out some ideas
static const bool carryOverNotSet = Utilities::isCarryOverNotSet(cfg, paymentMethodId);
static const uint minParkingPrice = Utilities::getMinimalParkingPrice(cfg, paymentMethodId);
Q_ASSERT_X(carryOverNotSet, __func__, "CARRYOVER SET (FOR KIRCHDORF)");
Q_ASSERT_X(prepaid, __func__, "PREPAID NOT SET (FOR KIRCHDORF)");
QDateTime start = start_datetime;
int weekdayId = -1;
int weekdayIdLast = -1;
int durationMinutesBrutto = 0;
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
#ifdef _DEBUG_
#undef _DEBUG_
#endif
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
//#define _DEBUG_ 1
#define _DEBUG_ 0
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
QDateTime current = start;
int days = 7;
while (--days > 0) {
weekdayId = current.date().dayOfWeek();
weekdayIdLast = weekdayId; // TODO: some end condition in json-file
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
current = current.addDays(1);
weekdayId = current.date().dayOfWeek();
if (weekdayId == weekdayIdLast) {
qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
return 0;
}
}
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
QTime to = QTime(0, 0, 0);
for (WTIterator itr = p.first; itr != p.second; ++itr) {
QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);
if (to < t) {
to = t;
}
}
if (current.time() >= to) {
GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff) there is no carry over.
2024-02-19 12:00:45 +01:00
if (carryOverNotSet) {
GetCostFromDuration(): set endtime to start in case cost==0.
2024-02-21 11:13:53 +01:00
end_datetime = start;
GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff) there is no carry over.
2024-02-19 12:00:45 +01:00
return 0;
} else {
QDateTime const dt = start;
start = start.addDays(1);
start.setTime(QTime(0, 0, 0));
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff) there is no carry over.
2024-02-19 12:00:45 +01:00
durationMinutesBrutto += dt.secsTo(start) / 60;
current = start;
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
} else {
break;
}
}
int durationMinutesNetto = 0;
uint price = 0;
if (carryOverNotSet) {
int minsToCarryOver = 0; // from one work-time to the other on the same day
GetCostFromDuration(): fixed moving from time range 8:00-12:00 -> 14:00-18:00.
2024-02-21 14:20:51 +01:00
int minsUsed = 0;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
QDateTime lastCurrent = QDateTime();
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
QVector<ATBWeekDaysWorktime> weekDayWorkTimeRanges;
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) {
weekDayWorkTimeRanges.append(itr->second); // working with vector is easier
}
int weekDayWorkTimeIndex = 0;
bool moveToNextTimeRange = false;
// time ranges for Neuhauser-Kirchdorf (743): 30, 5, 5, ... 5
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
auto timeRangeIt = cfg->TimeRange.cbegin();
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "weekDayWorkTimeRanges.size()" << weekDayWorkTimeRanges.size();
#endif
end_datetime = current;
return price;
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
QTime const &from = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_from.c_str(), Qt::ISODate);
QTime const &to = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_to.c_str(), Qt::ISODate);
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "from" << from.toString(Qt::ISODate)
<< "to" << to.toString(Qt::ISODate);
#endif
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
if (current.time() >= to) {
++weekDayWorkTimeIndex;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "try to use next available work-time with"
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "price" << price;
#endif
// time range is not affected
continue;
} else
if (current.time() <= from) {
if (prepaid) {
lastCurrent = current;
current.setTime(from); // move current forward (range==1),
// as prepaid is set
uint const minutesMoved = lastCurrent.secsTo(current) / 60;
durationMinutesBrutto += minutesMoved;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "lastCurrent" << lastCurrent.toString(Qt::ISODate)
<< "current" << current.toString(Qt::ISODate)
<< "minutesMoved" << minutesMoved
<< "durationMinutesBrutto" << durationMinutesBrutto;
#endif
if (weekDayWorkTimeIndex == 0) {
start_datetime = current;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
}
}
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
ATBTimeRange timeRange = timeRangeIt->second;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
timeRange.computeQTimes(current.time());
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
int duration = timeRange.time_range_to_in_minutes_from_start -
timeRange.time_range_from_in_minutes_from_start;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "price" << price;
#endif
test
2024-02-26 16:57:37 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
if (minsToCarryOver > 0) { // the price for this time range
// has been is paid already
Q_ASSERT_X(weekDayWorkTimeIndex > 0, __func__, "WRONG-WORK-TIME");
test
2024-02-26 16:57:37 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
current = current.addSecs(minsToCarryOver*60);
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
durationMinutes -= minsToCarryOver;
durationMinutesNetto += minsToCarryOver;
durationMinutesBrutto += minsToCarryOver;
test
2024-02-26 16:57:37 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
minsToCarryOver = 0;
test
2024-02-26 16:57:37 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "durationMinutes" << durationMinutes
<< "durationMinutesNetto" << durationMinutesNetto
<< "durationMinutesBrutto" << durationMinutesBrutto;
#endif
if (durationMinutes <= 0) {
end_datetime = current;
test
2024-02-26 16:57:37 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
test
2024-02-26 16:57:37 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
return price;
}
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
if (current.addSecs(duration * 60).time() <= to) {
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes;
#endif
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
moveToNextTimeRange = false;
for(const auto &x: cfg->PaymentRate) {
ATBPaymentRate const rate = x.second;
if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
price += (uint)rate.pra_price;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
durationMinutes -= duration;
durationMinutesNetto += duration;
durationMinutesBrutto += duration;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
current = current.addSecs(duration * 60);
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
// price has been updated; use next time range
moveToNextTimeRange = true;
break;
}
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "price" << price
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes
<< "durationMinutesNetto" << durationMinutesNetto
<< "durationMinutesBrutto" << durationMinutesBrutto;
#endif
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
if (durationMinutes <= 0) {
end_datetime = current;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
return price;
}
if (moveToNextTimeRange) {
if (++timeRangeIt != cfg->TimeRange.cend()) {
continue;
}
}
// havin a new time range means that we always have a new
// work-time-range
// ++timeRangeIt;
} else { // current.addSecs(duration * 60).time() > to
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
<< "duration" << duration
<< ", to:" << to.toString(Qt::ISODate);
#endif
lastCurrent = current;
current.setTime(to);
minsUsed = lastCurrent.secsTo(current) / 60;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "lastCurrent" << lastCurrent.toString(Qt::ISODate)
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes;
#endif
// mod duration: possibly discard some minutes in
// the next time-range
if (duration >= minsUsed) {
minsToCarryOver = duration - minsUsed;
}
durationMinutes -= minsUsed;
durationMinutesNetto += minsUsed;
durationMinutesBrutto += minsUsed;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "lastCurrent" << lastCurrent.toString(Qt::ISODate)
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "to" << to.toString(Qt::ISODate)
<< "minsUsed" << minsUsed
<< "minsToCarryOver" << minsToCarryOver
<< "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
<< "durationMinutes" << durationMinutes
<< "price" << price;
#endif
moveToNextTimeRange = false;
if (minsUsed > 0) {
for(const auto &x: cfg->PaymentRate) {
ATBPaymentRate const rate = x.second;
if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
price += (uint)rate.pra_price;
// price has been updated; use next time range
moveToNextTimeRange = true;
break;
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
}
}
}
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "current" << current.toString(Qt::ISODate)
<< "duration" << duration
<< "minsUsed" << minsUsed
<< "durationMinutes" << durationMinutes
<< "moveToNextTimeRange" << moveToNextTimeRange
<< "price" << price;
#endif
if (moveToNextTimeRange) {
if (++timeRangeIt != cfg->TimeRange.cend()) {
continue;
}
// no valid time range left
end_datetime = current;
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "price" << price;
#endif
return price;
}
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
}
end_datetime = start.addSecs(durationMinutesBrutto * 60);
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "start" << start.toString(Qt::ISODate)
<< "end_datetime" << end_datetime.toString(Qt::ISODate)
<< "final price" << std::max(price, minParkingPrice);
#endif
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
return std::max(price, minParkingPrice);
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
} // while (timeRangeIt != cfg->TimeRange.cend()) {
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
}
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
#if _DEBUG_==1
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< "INVALID END TIME";
#endif
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +01:00
end_datetime = QDateTime();
return 0;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value.
2023-11-27 16:18:06 +01:00
QDateTime start = start_datetime;
Ticket t = private_GetCostFromDuration(cfg, start,
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
durationMinutes,
prepaid);
Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value.
2023-11-27 16:18:06 +01:00
if (t) {
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
// qCritical().noquote() << t;
Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value.
2023-11-27 16:18:06 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
end_datetime = t.getValidUntil();
return t.getPrice();
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
bool Calculator::checkDurationMinutes(int minParkingTime,
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
int maxParkingTime,
int durationMinutes) {
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if (durationMinutes > maxParkingTime) {
qWarning() << QString("Total duration >= max_min (%1 >= %2)").arg(durationMinutes).arg(maxParkingTime);
return false;
}
if (durationMinutes < minParkingTime) {
qWarning() << QString("Total duration <= minMin (%1 <= %2)").arg(durationMinutes).arg(minParkingTime);
return false;
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
return true;
}
Implement findWorkTimeRange() and indNextWorkTimeRange().
2023-11-27 16:19:39 +01:00
int Calculator::findWorkTimeRange(QDateTime const &dt,
QScopedArrayPointer<TariffTimeRange> const &worktime,
size_t size) {
for (size_t w = 0; w < size; ++w) {
QTime const &worktime_from = worktime[w].getTimeFrom();
QTime const &worktime_to = worktime[w].getTimeUntil();
if ((dt.time() >= worktime_from) && (dt.time() < worktime_to)) {
return w;
}
}
return -1;
}
int Calculator::findNextWorkTimeRange(QDateTime const &dt,
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
QScopedArrayPointer<TariffTimeRange> const &worktime,
size_t size) {
Implement findWorkTimeRange() and indNextWorkTimeRange().
2023-11-27 16:19:39 +01:00
int nextWorkTimeRange = -1;
for (size_t w = 0; w < size; ++w) {
QTime const &worktime_from = worktime[w].getTimeFrom();
if (dt.time() < worktime_from) {
nextWorkTimeRange = w;
Fix: replace 'continue' with 'break' to return first fitting time-range in findNextWorkTimeRange().
2023-12-06 10:49:33 +01:00
break;
Implement findWorkTimeRange() and indNextWorkTimeRange().
2023-11-27 16:19:39 +01:00
}
}
return nextWorkTimeRange;
}
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
using namespace Utilities;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
QDateTime const &start,
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
int durationMinutes, // Netto
bool prepaid) {
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
Minor: private_GetCostFromDuration(): define static variables using helpers moved to namespace Utilities.
2023-12-12 10:55:19 +01:00
static const int minParkingTimeMinutes = Utilities::getMinimalParkingTime(cfg, paymentMethodId);
static const int maxParkingTimeMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
static const int durationMinutesNetto = durationMinutes;
Minor: private_GetCostFromDuration(): define static variables using helpers moved to namespace Utilities.
2023-12-12 10:55:19 +01:00
static const uint32_t weekDaysPrice = Utilities::computeWeekDaysPrice(cfg, paymentMethodId);
static const double weekDaysDurationUnit = Utilities::computeWeekDaysDurationUnit(cfg, paymentMethodId);
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
static const double specialDaysDurationUnit = 60.0;
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
if (!checkMinMaxMinutes) {
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
qCritical() << QString(
"ERROR: CONDITION minMin < maxMin (%1 < %2) IS NOT VALID")
.arg(minParkingTimeMinutes).arg(maxParkingTimeMinutes);
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
return Ticket();
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if (!checkDurationMinutes(minParkingTimeMinutes,
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
maxParkingTimeMinutes, durationMinutes)) {
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
return Ticket();
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
uint32_t price = 0;
uint32_t costFromDuration = 0;
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
double durationUnit = 0.0;
int specialDayId = -1;
bool isSpecialDay = false;
Ticket ticket;
QDateTime end = start;
QDateTime current;
int totalTimeRanges = 0;
for (current = start; durationMinutes > 0; current = current.addDays(1)) {
int const weekdayId = current.date().dayOfWeek();
specialDayId = -1;
// find worktime ranges for the current day
int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
int ranges = 0;
if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
// Set special day price:
durationUnit = specialDaysDurationUnit;
worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
SpecialDaysWorkTimeUntil(cfg, specialDayId));
ranges = 1;
} else {
// Set new price for the normal day: do not use a floating-point type
// 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;
// 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";
end = current;
current.setTime(QTime()); // start at midnight on the next day
continue;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
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) {
worktime[ranges].setTimeRange(WeekDaysWorkTimeFrom(itr),
WeekDaysWorkTimeUntil(itr));
ranges += 1;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
// qCritical() << "start" << start.toString(Qt::ISODate)
// << "current" << current.toString(Qt::ISODate) << lastWorktimeTo;
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
// find worktime range to start with
int currentRange = 0;
if (!isSpecialDay) {
if (start != current) { // on next day
current.setTime(worktime[currentRange].getTimeFrom());
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
} else {
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
// check if inputDate is located inside a valid worktime-range...
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
if (!prepaid && carryOverNotSet) { // parking is not allowed
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
return Ticket(start, QDateTime(), durationMinutesNetto, 0,
0, Ticket::s[INVALID_FROM_DATETIME]);
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
// find the next worktime-range (on the same day), and start from there
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
end = current;
continue;
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
current.setTime(worktime[currentRange].getTimeFrom());
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
}
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
// qCritical() << "current" << current.toString(Qt::ISODate);
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
if (durationMinutes > 0) {
QTime const &worktime_from = worktime[w].getTimeFrom();
QTime const &worktime_to = worktime[w].getTimeUntil();
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if (totalTimeRanges) {
// durationMinutes are always meant as netto time and
// the time between worktime-ranges are free.
current.setTime(worktime_from);
}
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if (price == 0) {
end = current;
current.setTime(QTime());
continue;
}
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if (current.time() == worktime_to) {
end = current;
current.setTime(QTime());
continue;
}
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
// Check prepaid
if (!prepaid) {
if ((current.time() < worktime_from) || (current.time() > worktime_to)) {
qDebug() << "[STOP] * Ticket is not valid * ";
return Ticket();
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
}
} else {
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
//qDebug() << "* PREPAID MODE ACTIVE *";
//qCritical() << "current" << current.toString(Qt::ISODate) << worktime_from << lastWorktimeTo;
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if (current.time() < worktime_from) {
current.setTime(worktime_from);
end = current;
} else if(current.time() > lastWorktimeTo) {
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
//qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
end = current;
current.setTime(QTime());
continue;
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
while(durationMinutes > 0) {
// Check for active year period
if (!IsYearPeriodActive(cfg, current)) {
return Ticket();
}
if(current.time() >= lastWorktimeTo) {
// Go to next day if minutes not spent
if (carryOverNotSet) {
// no carry_over, so stop computation
break;
}
current.setTime(QTime());
break; // stop while, and continue in outer loop
} else {
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
//qCritical() << "current" << current.toString(Qt::ISODate) << worktime_to;
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
if(current.time() < worktime_to) {
// Increment input date minutes for each monetary unit
current = current.addSecs(60);
end = current;
durationMinutes -= 1;
//costFromDuration += price_per_unit;
costFromDuration += price;
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
//qCritical() << "current" << current.toString(Qt::ISODate);
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
} else break;
}
} // while(durationMinutes > 0) {
} // if (durationMinutes > 0) {
} // for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
} // for (current = start; durationMinutes > 0; current = current.addDays(1)) {
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
int durationMinutesBrutto = start.secsTo(end) / 60;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
return
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
2023-11-28 15:25:37 +01:00
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
ceil(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
Ticket::s[VALID]);
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
QDateTime const &start,
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
uint32_t cost,
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
bool prepaid) {
// Get input date
QDateTime current = start;
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
private_GetDurationFromCost(): set static variables using helpers moved to namespace Utilities.
2023-12-12 10:58:08 +01:00
static const uint32_t minParkingTimeMinutes = std::max(Utilities::getMinimalParkingTime(cfg, paymentMethodId), 0);
static const uint32_t maxParkingTimeMinutes = std::max(Utilities::getMaximalParkingTime(cfg, paymentMethodId), 0);
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
static const uint32_t minParkingPrice = getMinimalParkingPrice(cfg, paymentMethodId);
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
// static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
private_GetDurationFromCost(): set static variables using helpers moved to namespace Utilities.
2023-12-12 10:58:08 +01:00
static const uint32_t weekDaysPrice = Utilities::computeWeekDaysPrice(cfg, paymentMethodId);
static const uint32_t weekDaysDurationUnit = Utilities::computeWeekDaysDurationUnit(cfg, paymentMethodId);
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
static const uint32_t specialDaysDurationUnit = 60;
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
if(cost < minParkingPrice) {
uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
return Ticket(start, current, durationMinutes, durationMinutes,
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
cost, Ticket::s[INVALID_PRICE]);
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
}
if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
// TODO
return Ticket();
}
if (maxParkingTimeMinutes <= minParkingTimeMinutes) {
// TODO
return Ticket();
}
uint32_t durationMinutesNetto = 0;
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
double moneyLeft = cost;
double durationUnit = 1;
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
int specialDayId = -1;
bool isSpecialDay = false;
QDateTime end = start;
int totalTimeRanges = 0;
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
double price = 0;
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
for (current = start; moneyLeft > 0 && moneyLeft >= price; current = current.addDays(1)) {
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
int const weekdayId = current.date().dayOfWeek();
specialDayId = -1;
// find worktime ranges for the current day
int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
int ranges = 0;
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
uint32_t p = 0;
if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &p))) {
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
// Set special day price:
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
durationUnit = specialDaysDurationUnit;
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
price = p / durationUnit;
price = std::round(price * 1000.0) / 1000.0;
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
SpecialDaysWorkTimeUntil(cfg, specialDayId));
ranges = 1;
} else {
// Set new price for the normal day: do not use a floating-point type
// for the price, rather compute with integers. Only at the very end of
// the computation the price is divided by durationUnit.
price = weekDaysPrice;
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
durationUnit = weekDaysDurationUnit;
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
price /= durationUnit;
price = std::round(price * 1000.0) / 1000.0; // round to 3 decimals
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
// If no working day found, skip it (epsecially Sundays!)
if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
// qDebug() << "No workday found, trying to find next available day";
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
end = current;
current.setTime(QTime()); // start at midnight on the next day
continue;
}
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) {
worktime[ranges].setTimeRange(WeekDaysWorkTimeFrom(itr),
WeekDaysWorkTimeUntil(itr));
ranges += 1;
}
}
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...
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
if (!prepaid && carryOverNotSet) { // parking is not allowed
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
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
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
end = current;
continue;
}
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
current.setTime(worktime[currentRange].getTimeFrom());
}
}
}
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
if (moneyLeft > 0) {
QTime const &worktime_from = worktime[w].getTimeFrom();
QTime const &worktime_to = worktime[w].getTimeUntil();
if (totalTimeRanges) {
// durationMinutes are always meant as netto time and
// the time between worktime-ranges are free.
current.setTime(worktime_from);
}
if (price == 0) {
// inputDate = inputDate.addDays(1);
// inputDate.setTime(worktime_from);
end = current;
current.setTime(QTime());
continue;
}
if (current.time() == worktime_to) {
end = current;
current.setTime(QTime());
continue;
}
// Check prepaid
if (!prepaid) {
Minor: more detailed debug output
2024-02-01 13:18:27 +01:00
if (current.time() < worktime_from) {
qDebug() << "[STOP] TICKET IS NOT VALID: "
<< QString("%1 (current) < %2 (start)")
.arg(current.toString(Qt::ISODate)
.arg(worktime_from.toString(Qt::ISODate)));
return Ticket();
} else
if (current.time() > worktime_to) {
qDebug() << "[STOP] TICKET IS NOT VALID: "
<< QString("%1 (current) > %2 (end)")
.arg(current.toString(Qt::ISODate)
.arg(worktime_to.toString(Qt::ISODate)));
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
return Ticket();
}
} else {
if (current.time() < worktime_from) {
Minor: more detailed debug output
2024-02-01 13:18:27 +01:00
qDebug() << "*** PREPAID *** Current time is before time range start, fast-forward to start"
<< worktime_from.toString(Qt::ISODate);
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
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";
end = current;
current.setTime(QTime());
continue;
}
}
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
while(moneyLeft >= price) {
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
// Check for active year period
if (!IsYearPeriodActive(cfg, current)) {
return Ticket();
}
Moved check if netto minutes exceed max. parking time down into loop. If this is the case, then stop updating the end-time-date.
2024-02-01 13:19:08 +01:00
// if(durationMinutesNetto >= maxParkingTimeMinutes) {
// might be useful for overpayment
// durationMinutesNetto = maxParkingTimeMinutes;
// int durationMinutesBrutto = start.secsTo(end) / 60;
//
// return
// Ticket(start, end, durationMinutesNetto,
// durationMinutesBrutto, cost, Ticket::s[INVALID_PRICE]);
//
// }
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
if(current.time() >= lastWorktimeTo) {
// Go to next day if minutes not spent
if (carryOverNotSet) {
// no carry_over, so stop computation
break;
}
current.setTime(QTime());
break; // stop while, and continue in outer loop
} else {
if(current.time() < worktime_to) {
// Increment input date minutes for each monetary unit
Moved check if netto minutes exceed max. parking time down into loop. If this is the case, then stop updating the end-time-date.
2024-02-01 13:19:08 +01:00
durationMinutesNetto += 1;
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
moneyLeft -= price;
moneyLeft = std::round(moneyLeft * 1000.0) / 1000.0;
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
current = current.addSecs(60);
Moved check if netto minutes exceed max. parking time down into loop. If this is the case, then stop updating the end-time-date.
2024-02-01 13:19:08 +01:00
//qCritical() << "moneyLeft" << moneyLeft
// << "durationMinutesNetto" << durationMinutesNetto
// << "current" << current.toString(Qt::ISODate);
if(durationMinutesNetto <= maxParkingTimeMinutes) {
// stop updating of end-date if parking time is
// overshot
end = current;
}
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
} else break;
}
} // while(durationMinutes > 0) {
} // if (durationMinutes > 0) {
} // for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
} // for (current = start; durationMinutes > 0; current = current.addDays(1)) {
Moved check if netto minutes exceed max. parking time down into loop. If this is the case, then stop updating the end-time-date.
2024-02-01 13:19:08 +01:00
int durationMinutesBrutto = start.secsTo(end) / 60;
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
//qCritical() << "start" << start.toString(Qt::ISODate) << "end"
// << end.toString(Qt::ISODate) << durationMinutesBrutto;
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
return
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
cost, Ticket::s[VALID]);
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Added dummy member GetPriceSteps(). To implement in a later step.
2024-01-30 10:25:50 +01:00
QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
return QList<int>();
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
#define DEBUG_GET_TIME_STEPS (1)
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
QDateTime const &s) const {
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex;
}
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
if (m_timeSteps.size() > paymentOptionIndex) {
Recompute time step list (previously is was saved as an optimization)
2024-07-23 12:51:08 +02:00
//if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
// return m_timeSteps[paymentOptionIndex];
//}
// recompute time steps
m_timeSteps[paymentOptionIndex].clear();
Fix: init m_timeSteps-vector in case its size is 0: m_timeSteps.push_back(QList<int>()). Detected during testing.
2024-04-24 13:18:23 +02:00
} else {
Use of permitType in several places
2024-07-25 09:49:16 +02:00
while (m_timeSteps.size() <= paymentOptionIndex) {
m_timeSteps.push_back(QList<int>());
}
GetTimeSteps(): compute time step only once, when calling get_minimal_parkingprice(). Otherwise use timeSteps-member in Calculator.
2024-01-23 10:53:26 +01:00
}
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
QDateTime start = s;
start.setTime(QTime(s.time().hour(), s.time().minute(), 0));
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
Use of permitType in several places
2024-07-25 09:49:16 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") start:" << start.toString(Qt::ISODate);
Use of permitType in several places
2024-07-25 09:49:16 +02:00
}
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") start parking time:" << start.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option id:" << pop_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment method id:" << static_cast<int>(paymentMethodId);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") time step config:" << pop_time_step_config;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepaid option id:" << pop_prepaid_option_id;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
}
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
GetTimeSteps(): compute time step only once, when calling get_minimal_parkingprice(). Otherwise use timeSteps-member in Calculator.
2024-01-23 10:53:26 +01:00
//qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
Minor: add debug output
2024-01-23 09:02:55 +01:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
if (paymentMethodId == PaymentMethod::Progressive) { // e.g. neuhauser kirchdorf (743)
std::size_t const s = cfg->TimeRange.size();
for (std::size_t id = 1; id <= s; ++id) {
int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
m_timeSteps[paymentOptionIndex].append(step);
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
}
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
} else
if (paymentMethodId == PaymentMethod::Degressive) { // e.g. fuchs, valser alm (fane) (502)
// with growing time, the price goes down
// for instance: until 13.59: price 8, from 14:00: price 5, then for the next day: 8
// for the following days: 8 euros
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") degressive:";
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
m_timeSteps[paymentOptionIndex].clear();
// lookup pop_next_id in worktimes;
std::optional<QVector<ATBWeekDaysWorktime>> const &w = cfg->getAllWeekDayWorkTimes();
if (w.has_value()) {
QVector<ATBWeekDaysWorktime> const &vec = w.value();
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
//if (pop_carry_over == false) {
for (int i = 1; i <= vec.size(); ++i) {
QTime const &from = QTime::fromString(QString::fromStdString(vec[i-1].pwd_time_from), Qt::ISODate);
QString const &toStr = QString::fromStdString(vec[i-1].pwd_time_to);
QTime const &to = QTime::fromString(toStr, Qt::ISODate);
int weekDayId = vec[i-1].pwd_period_day_in_week_id;
if (start.date().dayOfWeek() == weekDayId) {
if (DBG_LEVEL >= DBG_DEBUG) {
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
}
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
if (start.time() >= from && start.time() < to) {
int runtimeInMinutes = (start.time().secsTo(to) / 60);
if (to.hour() == 23 && to.minute() == 59) {
runtimeInMinutes += 1;
}
if (DBG_LEVEL >= DBG_DEBUG) {
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes" << runtimeInMinutes;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") index" << paymentOptionIndex;
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
}
// m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
int pop_id = vec[i-1].pwd_pop_id;
// int pwd_id = vec[i-1].pwd_id;
// int pwd_next_id = vec[i-1].pwd_next_id;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
}
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
int price = -1;
int durationId = -1;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
durationId = itr->second.pra_payment_unit_id;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
price = itr->second.pra_price;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
ATBDuration duration = search->second;
duration.pun_duration = runtimeInMinutes;
search->second = duration;
break;
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
}
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
}
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
if (price >= 0 && durationId >= 0) {
if (DBG_LEVEL >= DBG_DEBUG) {
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") durationId" << durationId;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
}
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
if (durationId == itr->second.pra_payment_unit_id) {
itr->second.pra_price = price;
cfg->getPaymentOptions(paymentOptionIndex).pop_min_price = price;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") park min price" << price;
break;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
}
}
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
}
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
break;
} // if (start.time() >= from && start.time() < to) {
} // if (start.date().dayOfWeek() == weekDayId) {
} // for (int i = 1; i <= vec.size(); ++i) {
m_timeSteps[paymentOptionIndex].clear();
int runtimeInMinutes = 0;
for (Configuration::TariffDurationType::const_iterator it = cfg->Duration.cbegin();
it != cfg->Duration.cend();
++it) {
runtimeInMinutes += it->second.pun_duration;
m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
}
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
//} // if (pop_carry_over == false) {
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
} // if (w.has_value()) {
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
} else {
uint16_t timeStepCompensation = 0;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option carry over:" << pop_carry_over;
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
if (pop_carry_over) {
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
int const pop_carry_over_time_range_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_time_range_id;
save experimental
2024-07-21 20:58:12 +02:00
int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time range id:" << pop_carry_over_time_range_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over option id:" << pop_carry_over_time_range_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
}
save experimental
2024-07-21 20:58:12 +02:00
int weekDay = start.date().dayOfWeek();
QTime const carryOverStart = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
QTime const carryOverEnd = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
int const carryOverDuration = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over start:" << carryOverStart.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over end:" << carryOverEnd.toString(Qt::ISODate);
}
save experimental
2024-07-21 20:58:12 +02:00
// TODO: reparieren
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const durationId = itr->second.pra_payment_unit_id;
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
ATBDuration duration = search->second;
if (durationId == 1) {
QDateTime carryOver = start;
carryOver = carryOver.addDays(1);
carryOver.setTime(QTime(0, 0, 0));
int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
qCritical()
<< QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
.arg(timeStep).arg(duration.pun_duration_min)
.arg(timeStep).arg(duration.pun_duration_max);
break;
}
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") configured minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
// set dynamic minimal parking time
Pass paymentOptionIndex to cfg->getPaymentOptions(), which has a default parameter of paymentOptionIndex=0.
2024-04-24 13:20:02 +02:00
cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = timeStep;
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
GetTimeSteps(): add sanity check
2024-07-16 16:47:26 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
duration.pun_duration = timeStep;
timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
m_timeSteps[paymentOptionIndex] << duration.pun_duration;
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
} else {
duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
m_timeSteps[paymentOptionIndex] << duration.pun_duration;
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
}
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
cfg->Duration.erase(search);
cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
} else { // if (search != cfg->Duration.end()) {
// TODO
}
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
}
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
} else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
Minor: change debug output
2024-07-29 17:26:26 +02:00
//if (DBG_LEVEL >= DBG_DEBUG) {
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time range from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time range to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
Minor: change debug output
2024-07-29 17:26:26 +02:00
//}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
m_timeSteps[paymentOptionIndex].clear();
save experimental
2024-07-21 20:58:12 +02:00
std::optional<QDateTime> prepaidStart = cfg->prepaidStart(start, pop_prepaid_option_id);
// TODO: zusaetzlicher faktor falls vorkauf-option zieht
if (prepaidStart) {
start = prepaidStart.value();
Minor: change debug output
2024-07-29 17:26:26 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepaid adapted start:" << start.toString(Qt::ISODate);
Minor: change debug output
2024-07-29 17:26:26 +02:00
}
save experimental
2024-07-21 20:58:12 +02:00
} else {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
}
Recompute time step list (previously is was saved as an optimization)
2024-07-23 12:51:08 +02:00
// TODO: check if needed
save experimental
2024-07-21 20:58:12 +02:00
QDateTime interpolationEnd;
std::optional<QDateTime> interpolationEndDate = cfg->getInterpolationEnd(start, paymentOptionIndex);
if (interpolationEndDate) {
interpolationEnd = interpolationEndDate.value();
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpolation end:" << interpolationEnd.toString(Qt::ISODate);
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
} else {
save experimental
2024-07-21 20:58:12 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
Added changes for Schnals
2024-07-19 14:10:07 +02:00
}
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
// int const start_time = start.time().hour() * 60 + start.time().minute();
save experimental
2024-07-21 20:58:12 +02:00
QDateTime nextTimeStep = start;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
int runtimeInMinutes = 0;
Minor: change debug output
2024-07-29 17:26:26 +02:00
// qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes (1):" << runtimeInMinutes;
Use of permitType in several places
2024-07-25 09:49:16 +02:00
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
// int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
Recompute time step list (previously is was saved as an optimization)
2024-07-23 12:51:08 +02:00
// TODO: auslagern
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const durationId = itr->second.pra_payment_unit_id;
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
ATBDuration duration = search->second;
duration.pun_duration = duration.pun_duration_saved;
search->second = duration;
}
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes:" << runtimeInMinutes;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
Added changes for Schnals
2024-07-19 14:10:07 +02:00
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const durationId = itr->second.pra_payment_unit_id;
Use of permitType in several places
2024-07-25 09:49:16 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") durationId" << durationId;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
// int const price = itr->second.pra_price;
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
ATBDuration duration = search->second;
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
// ATBDuration &previous = search->second;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
if (duration.pun_interpolation_id == -1) {
// should never happen -> misconfigured tariff-file
qCritical() << "(" << __func__ << ":" << __LINE__ << ") ERROR pun_interpolation not set!";
qCritical() << "(" << __func__ << ":" << __LINE__ << ") See for instance customer_505/6";
break;
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes:" << runtimeInMinutes;
Use of permitType in several places
2024-07-25 09:49:16 +02:00
Added changes for Schnals
2024-07-19 14:10:07 +02:00
std::optional<ATBInterpolation> ipolCheck = cfg->getInterpolationType(duration.pun_interpolation_id);
if (ipolCheck) {
ATBInterpolation interpolation = ipolCheck.value();
save experimental
2024-07-21 20:58:12 +02:00
if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE) {
Use of permitType in several places
2024-07-25 09:49:16 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") HIER NICHT";
save experimental
2024-07-21 20:58:12 +02:00
interpolation.dynamic_start = start.time();
interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
// int const end_time = interpolation.dynamic_end.hour() * 60 + interpolation.dynamic_end.minute();
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
// qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration:" << duration.pun_duration;
// qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_interpolation:" << duration.pun_interpolation_id;
// qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpolation dynamic end:" << interpolationEnd.toString(Qt::ISODate);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
// qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpolation dynamic end time:" << end_time;
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
// int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
runtimeInMinutes += duration.pun_duration;
nextTimeStep = start.addSecs(runtimeInMinutes * 60);
save experimental
2024-07-21 20:58:12 +02:00
Use of permitType in several places
2024-07-25 09:49:16 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes (1):" << runtimeInMinutes;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (nextTimeStep.time() > carryOverStart) {
int const backTime = carryOverStart.secsTo(nextTimeStep.time()) / 60;
runtimeInMinutes -= backTime;
nextTimeStep.setTime(carryOverStart);
nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
runtimeInMinutes += (backTime + carryOverDuration);
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") next time step:" << nextTimeStep.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes:" << runtimeInMinutes;
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
int rest = nextTimeStep.secsTo(interpolationEnd);
if (nextTimeStep <= interpolationEnd) {
if (rest > 0 && rest < duration.pun_duration) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") rest minutes:" << rest;
// last time step before switching to dayticket (see Schnals 505/506)
//if (duration.pun_duration > 0) {
// m_timeSteps[paymentOptionIndex] << duration.pun_duration;
save experimental
2024-07-21 20:58:12 +02:00
//}
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
} else {
m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
}
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
duration.pun_duration = runtimeInMinutes;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id:" << duration.pun_id;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration:" << duration.pun_duration;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
search->second = duration;
} else
if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
Use of permitType in several places
2024-07-25 09:49:16 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id:" << duration.pun_id;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun duration:" << duration.pun_duration;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") next time step:" << nextTimeStep.toString(Qt::ISODate);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes (2):" << runtimeInMinutes;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
Use of permitType in several places
2024-07-25 09:49:16 +02:00
if (paymentOptionIndex == 1) { // testing TODO: muss in die payment options hinein
if (runtimeInMinutes == 0) {
if (start.time() < carryOverStart) {
runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
duration.pun_duration = runtimeInMinutes;
m_timeSteps[paymentOptionIndex] << duration.pun_duration;
search->second = duration;
Save computed pop_min_time.
2024-07-29 17:27:16 +02:00
cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
Use of permitType in several places
2024-07-25 09:49:16 +02:00
continue;
}
}
}
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
if (runtimeInMinutes == 0) {
if (start.time() < carryOverStart) {
runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
Minor: change debug output
2024-07-29 17:26:26 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") start:" << start.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carryOverStart:" << carryOverStart.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes:" << runtimeInMinutes;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id:" << duration.pun_id;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
duration.pun_duration = runtimeInMinutes;
m_timeSteps[paymentOptionIndex] << duration.pun_duration;
search->second = duration;
cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
}
continue;
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes:" << runtimeInMinutes;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
QDateTime s = start.addSecs(runtimeInMinutes * 60);
Minor: comment out some code to prevent compiler warnings (about some unused variables).
2024-09-02 17:15:33 +02:00
// int const minutes = s.time().secsTo(carryOverStart) / 60;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
Use of permitType in several places
2024-07-25 09:49:16 +02:00
#if 0
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (minutes > 0) {
runtimeInMinutes += minutes;
previous.pun_duration += minutes;
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") previous:" << previous.pun_duration;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
m_timeSteps[paymentOptionIndex].last() += minutes;
}
}
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
#endif
save experimental
2024-07-21 20:58:12 +02:00
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
Use of permitType in several places
2024-07-25 09:49:16 +02:00
nextTimeStep = start.addSecs(runtimeInMinutes * 60);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
runtimeInMinutes += duration.pun_duration;
nextTimeStep = start.addSecs(runtimeInMinutes * 60);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") carryOverStart:" << carryOverStart.toString(Qt::ISODate);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
Checkin for testing
2024-07-26 17:01:44 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
// TOOO: truncate-flag == false
if (nextTimeStep.time() > carryOverStart) {
int const backTime = carryOverStart.secsTo(nextTimeStep.time());
runtimeInMinutes -= backTime;
nextTimeStep.setTime(carryOverStart);
nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
runtimeInMinutes += (backTime + carryOverDuration);
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes:" << runtimeInMinutes;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
} else
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (nextTimeStep.time() < carryOverStart) {
int const forwardTime = nextTimeStep.time().secsTo(carryOverStart) / 60;
runtimeInMinutes += forwardTime;
nextTimeStep.setTime(carryOverStart);
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes:" << runtimeInMinutes;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
Use of permitType in several places
2024-07-25 09:49:16 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id:" << duration.pun_id;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun duration:" << duration.pun_duration;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") next time step:" << nextTimeStep.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") runtime in minutes (2):" << runtimeInMinutes;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
Remove correction
2024-07-26 17:04:33 +02:00
duration.pun_duration = runtimeInMinutes;
// duration.pun_duration = runtimeInMinutes - carryOverDuration;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
m_timeSteps[paymentOptionIndex] << duration.pun_duration;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
search->second = duration;
Added changes for Schnals
2024-07-19 14:10:07 +02:00
} else {
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") HIER NICHT";
Added changes for Schnals
2024-07-19 14:10:07 +02:00
cfg->Duration.erase(search);
}
}
}
}
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
}
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
} else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
// TODO
save experimental
2024-07-21 20:58:12 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
}
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf). Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
} else { // if (pop_carry_over) {
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
// TODO
save experimental
2024-07-21 20:58:12 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
}
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
}
} else {
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option time step config:" << "TimeStepConfig::STATIC";
Minor: add debug output
2024-01-23 09:02:55 +01:00
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{
int const durationId = itr->second.pra_payment_unit_id;
int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
int size = m_timeSteps.size();
while (size <= paymentOptionIndex) {
m_timeSteps.push_back(QList<int>());
size = m_timeSteps.size();
}
m_timeSteps[paymentOptionIndex] << durationUnit;
Extend computation of time steps in GetTimeSteps() for the case of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Recompute time step list (previously is was saved as an optimization)
2024-07-23 12:51:08 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") NEW timeSteps:" << m_timeSteps;
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") NEW timeSteps:" << m_timeSteps;
GetTimeSteps(): compute time step only once, when calling get_minimal_parkingprice(). Otherwise use timeSteps-member in Calculator.
2024-01-23 10:53:26 +01:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
for (int i = 0; i < m_timeSteps[paymentOptionIndex].size(); ++i) {
QDateTime nextTime = s;
// nextTime.setTime(QTime(0, 0, 0));
int const secs = m_timeSteps[paymentOptionIndex][i] * 60;
nextTime = nextTime.addSecs(secs);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") step"
<< i << secs << m_timeSteps[0][i] << "->" << nextTime.toString(Qt::ISODate);
Added changes for Schnals
2024-07-19 14:10:07 +02:00
GetTimeSteps(): updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
}
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
return m_timeSteps[paymentOptionIndex];
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Added changes for Schnals
2024-07-19 14:10:07 +02:00
#undef DEBUG_GET_TIME_STEPS
GetPriceForTimeStep(): use parameter paymentOptionIndex.
2024-04-19 13:33:54 +02:00
uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const {
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Use of permitType in several places
2024-07-25 09:49:16 +02:00
// test
// paymentOptionIndex = 1;
GetPriceForTimeStep(): use parameter paymentOptionIndex.
2024-04-19 13:33:54 +02:00
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
GetPriceForTimeStep(): Use special flag 'pop_accumulate_prices' to add up prices given in the tariff json file.
2024-07-23 11:53:22 +02:00
int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
uint32_t price = 0;
GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
int pun_duration = 0;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{
int const payment_unit_id = itr->second.pra_payment_unit_id;
int const pun_id = cfg->Duration.find(payment_unit_id)->second.pun_id;
Q_ASSERT(pun_id == payment_unit_id);
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
if (pop_accumulate_durations) {
pun_duration += cfg->Duration.find(payment_unit_id)->second.pun_duration;
} else {
pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
}
GetPriceForTimeStep(): Use special flag 'pop_accumulate_prices' to add up prices given in the tariff json file.
2024-07-23 11:53:22 +02:00
if (pop_accumulate_prices) {
price += itr->second.pra_price;
} else {
price = (uint32_t)(itr->second.pra_price);
}
GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
if (DBG_LEVEL >= DBG_DEBUG) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
}
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
if (timeStep == pun_duration) {
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
GetPriceForTimeStep(): Use special flag 'pop_accumulate_prices' to add up prices given in the tariff json file.
2024-07-23 11:53:22 +02:00
return price;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
}
return 0;
}
uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
int const pop_id = cfg->getPaymentOptions().pop_id;
GetPriceForTimeStep(): Fix: user default payment option
2024-07-26 13:11:29 +02:00
int const pop_accumulate_prices = cfg->getPaymentOptions().pop_accumulate_prices;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") accumulate prices" << pop_accumulate_prices;
Add some debug output into GetDurationForPrice().
2024-07-26 13:34:18 +02:00
GetPriceForTimeStep(): Fix: user default payment option
2024-07-26 13:11:29 +02:00
int new_price = 0;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
uint32_t duration = 0;
GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.
2024-07-26 12:53:42 +02:00
uint32_t duration_previous = 0;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{
int const durationId = itr->second.pra_payment_unit_id;
int const pra_price = itr->second.pra_price;
uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
if (pra_price == price) {
return durationUnit;
}
if (pra_price < price) {
duration = durationUnit;
}
GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.
2024-07-26 12:53:42 +02:00
if (pop_accumulate_prices) {
new_price += pra_price;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pra_price:" << pra_price;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") new_price:" << new_price;
GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.
2024-07-26 12:53:42 +02:00
if (new_price <= price) {
Add some debug output into GetDurationForPrice().
2024-07-26 13:34:18 +02:00
duration_previous = durationUnit;
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.
2024-07-26 12:53:42 +02:00
} else {
Minor: removed debug output
2024-07-29 11:30:00 +02:00
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.
2024-07-26 12:53:42 +02:00
return duration_previous;
}
}
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
}
Minor: removed debug output
2024-07-29 11:30:00 +02:00
qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration" << duration << "for price" << price;
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
return duration;
}
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
std::optional<struct price_t>
Calculator::GetDailyTicketPrice(Configuration* cfg,
QDateTime const &startDatetime,
QDateTime &endTime,
PERMIT_TYPE permitType) {
struct price_t price;
std::optional<struct price_t> value;
std::optional<ATBWeekDaysWorktime> workTime =
cfg->getWeekDayWorkTime(startDatetime.time(),
(Qt::DayOfWeek)startDatetime.date().dayOfWeek());
if (workTime) {
ATBWeekDaysWorktime const &wt = workTime.value();
endTime = startDatetime;
endTime.setTime(QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate));
std::optional<QVector<ATBDailyTicket>> dailyTickets = cfg->getDailyTicketsForAllKeys();
if (dailyTickets) {
QVector<ATBDailyTicket> const tickets = dailyTickets.value();
switch (permitType) {
Minor: add case for PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET (TODO).
2024-06-04 11:18:47 +02:00
case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
// TODO
} break;
GetDailyTicketPrice(): add case for FOOD_STAMP (not implemented)
2024-02-28 12:05:14 +01:00
case PERMIT_TYPE::FOOD_STAMP: {
// TODO
} break;
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
case PERMIT_TYPE::DAY_TICKET_ADULT: {
std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::ADULT);
if (c) {
for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
int priceId = tickets[i].daily_ticket_price_id;
Fixed GetDailyTicket(): use pop_id as key to find payment rate.
2024-01-31 11:40:41 +01:00
QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
int const pop_id = paymentOptions.at(j).pop_id;
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
if (paymentRates) {
QVector<ATBPaymentRate> const &pr = paymentRates.value();
for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
if (pr.at(k).pra_payment_option_id == pop_id) {
if (priceId == pr.at(k).pra_payment_unit_id) {
price.netto = pr.at(k).pra_price;
value = value.value_or(price);
}
}
}
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
}
}
}
}
}
} break;
case PERMIT_TYPE::DAY_TICKET_TEEN: {
std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::TEEN);
if (c) {
for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
int priceId = tickets[i].daily_ticket_price_id;
Fixed GetDailyTicket(): use pop_id as key to find payment rate.
2024-01-31 11:40:41 +01:00
QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
int const pop_id = paymentOptions.at(j).pop_id;
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
if (paymentRates) {
QVector<ATBPaymentRate> const &pr = paymentRates.value();
for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
if (pr.at(k).pra_payment_option_id == pop_id) {
if (priceId == pr.at(k).pra_payment_unit_id) {
price.netto = pr.at(k).pra_price;
value = value.value_or(price);
}
}
}
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
}
}
}
}
}
} break;
case PERMIT_TYPE::DAY_TICKET_CHILD: {
Fixed GetDailyTicket(): use pop_id as key to find payment rate.
2024-01-31 11:40:41 +01:00
std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::CHILD);
if (c) {
for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
int priceId = tickets[i].daily_ticket_price_id;
QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
int const pop_id = paymentOptions.at(j).pop_id;
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
if (paymentRates) {
QVector<ATBPaymentRate> const &pr = paymentRates.value();
for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
if (pr.at(k).pra_payment_option_id == pop_id) {
if (priceId == pr.at(k).pra_payment_unit_id) {
price.netto = pr.at(k).pra_price;
value = value.value_or(price);
}
}
}
}
}
}
}
}
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
}
// [[fallthrough]];
case PERMIT_TYPE::SHORT_TERM_PARKING: {
}
// [[fallthrough]];
case PERMIT_TYPE::DAY_TICKET: {
Use of permitType in several places
2024-07-25 09:49:16 +02:00
} break;
case PERMIT_TYPE::DAY_TICKET_PKW: {
PermitType const permitType(PERMIT_TYPE::DAY_TICKET_PKW);
std::optional<ATBPaymentOption> paymentOption = cfg->getPaymentOptionForKey(permitType.get());
if (paymentOption) {
ATBPaymentOption option = paymentOption.value();
int pop_id = option.pop_id;
int pop_daily_card_price = option.pop_daily_card_price;
qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
qCritical() << " PERMIT-TYPE:" << permitType.toString();
qCritical() << " option id:" << pop_id;
qCritical() << "daily_ticket_card_price:" << pop_daily_card_price;
price.netto = pop_daily_card_price;
value = value.value_or(price);
}
} break;
case PERMIT_TYPE::DAY_TICKET_BUS: {
} break;
case PERMIT_TYPE::DAY_TICKET_CAMPER: {
} break;
case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
PermitType const permitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
std::optional<ATBPaymentOption> paymentOption = cfg->getPaymentOptionForKey(permitType.get());
if (paymentOption) {
ATBPaymentOption option = paymentOption.value();
int pop_id = option.pop_id;
int pop_daily_card_price = option.pop_daily_card_price;
qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
qCritical() << " PERMIT-TYPE:" << permitType.toString();
qCritical() << " option id:" << pop_id;
qCritical() << "daily_ticket_card_price:" << pop_daily_card_price;
price.netto = pop_daily_card_price;
value = value.value_or(price);
}
} break;
case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
} break;
case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER: {
} break;
case PERMIT_TYPE::SZEGED_START: {
} break;
case PERMIT_TYPE::SZEGED_STOP: {
} break;
case PERMIT_TYPE::INVALID: {
} break;
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
}
GetDailyTicketPrice(): improve for projects which have not defined a daily ticket in their tariff-files.
2024-02-22 16:37:11 +01:00
} else {
// for projects which have not defined a daily ticket in their
// tariff-files (e.g. szeged)
price.netto = cfg->getPaymentOptions().pop_daily_card_price;
qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
qCritical() << " start:" << startDatetime.toString(Qt::ISODate);
qCritical() << " workTime from:" << QTime::fromString(QString(wt.pwd_time_from.c_str()), Qt::ISODate);
qCritical() << " workTime to:" << QTime::fromString(QString(wt.pwd_time_to.c_str()), Qt::ISODate);
qCritical() << "daily_ticket_card_price:" << price.netto;
value = value.value_or(price);
Implemented GetDailyTicketPrice(). To be tested.
2024-01-30 10:26:53 +01:00
}
}
return value;
}
Reference in New Issue Copy Permalink