Compare commits
No commits in common. "f7af631de6833080cc10f2620136866f95921265" and "f87399ed448f11595034c4b8d6a5e39ade006572" have entirely different histories.
f7af631de6
...
f87399ed44
@ -3,7 +3,6 @@
|
||||
|
||||
#include <time.h>
|
||||
#include <inttypes.h>
|
||||
#include "tariff_time_range.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
@ -32,11 +31,6 @@ struct CALCULATE_LIBRARY_API price_t {
|
||||
double brutto;
|
||||
double vat_percentage;
|
||||
double vat;
|
||||
|
||||
explicit price_t() {
|
||||
units = 0;
|
||||
netto = brutto = vat_percentage = vat = 0.0;
|
||||
}
|
||||
};
|
||||
|
||||
enum class PERMIT_TYPE : quint8 {
|
||||
@ -69,25 +63,8 @@ struct CALCULATE_LIBRARY_API CalcState {
|
||||
|
||||
State m_status;
|
||||
QString m_desc;
|
||||
TariffTimeRange m_allowedTimeRange;
|
||||
|
||||
explicit CalcState()
|
||||
: m_status(State::SUCCESS)
|
||||
, m_desc("") {
|
||||
}
|
||||
|
||||
explicit CalcState(State state, QString desc = "")
|
||||
: m_status(state)
|
||||
, m_desc(desc) {
|
||||
}
|
||||
|
||||
explicit CalcState(State state, QString desc = "",
|
||||
QTime const &from = QTime(),
|
||||
QTime const &until = QTime())
|
||||
: m_status(state)
|
||||
, m_desc(desc)
|
||||
, m_allowedTimeRange(from, until) {
|
||||
}
|
||||
explicit CalcState() : m_status(State::SUCCESS), m_desc("") {}
|
||||
|
||||
explicit operator bool() const noexcept {
|
||||
return (m_status == State::SUCCESS);
|
||||
@ -131,7 +108,6 @@ struct CALCULATE_LIBRARY_API CalcState {
|
||||
break;
|
||||
case State::WRONG_ISO_TIME_FORMAT:
|
||||
s = "WRONG_ISO_TIME_FORMAT";
|
||||
break;
|
||||
case State::OUTSIDE_ALLOWED_PARKING_TIME:
|
||||
s = "OUTSIDE_ALLOWED_PARKING_TIME";
|
||||
}
|
||||
@ -140,14 +116,6 @@ struct CALCULATE_LIBRARY_API CalcState {
|
||||
|
||||
CalcState &set(State s) { m_status = s; return *this; }
|
||||
CalcState &setDesc(QString s) { m_desc = s; return *this; }
|
||||
|
||||
void setAllowedTimeRange(QTime const &from, QTime const &until) {
|
||||
m_allowedTimeRange.setTimeRange(from, until);
|
||||
}
|
||||
|
||||
TariffTimeRange getAllowedTimeRange() {
|
||||
return m_allowedTimeRange;
|
||||
}
|
||||
};
|
||||
|
||||
CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
|
||||
|
||||
@ -35,8 +35,6 @@ public:
|
||||
void ResetPriceSteps() { m_priceSteps.clear(); }
|
||||
QList<int> priceSteps() const { return m_priceSteps; }
|
||||
|
||||
CalcState isParkingAllowed(Configuration const *cfg, QDateTime const &start);
|
||||
|
||||
/// <summary>
|
||||
/// Gets duration in seconds from cost
|
||||
/// </summary>
|
||||
|
||||
@ -311,6 +311,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
|
||||
return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
|
||||
}
|
||||
if (duration == 0) {
|
||||
memset(price, 0x00, sizeof(*price));
|
||||
return calcState.set(CalcState::State::SUCCESS);
|
||||
}
|
||||
|
||||
@ -374,6 +375,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
|
||||
return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
|
||||
}
|
||||
if (netto_parking_time == 0) {
|
||||
memset(price, 0x00, sizeof(*price));
|
||||
return calcState.set(CalcState::State::SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
@ -134,17 +134,30 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
|
||||
return inputDate.toString(Qt::ISODate).toStdString();
|
||||
} else {
|
||||
if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
|
||||
QDateTime const &start = QDateTime::fromString(start_datetime, Qt::ISODate);
|
||||
if (Utilities::IsYearPeriodActive(cfg, start)) {
|
||||
if (!prepaid) {
|
||||
CalcState cs = isParkingAllowed(cfg, inputDate);
|
||||
if (cs) {
|
||||
inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
|
||||
return inputDate.toString(Qt::ISODate).toStdString();
|
||||
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
|
||||
if (businessHours == BusinessHours::OnlyWeekDays) {
|
||||
int const weekdayId = start.date().dayOfWeek();
|
||||
|
||||
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
|
||||
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
|
||||
|
||||
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 && startTime <= until) {
|
||||
return inputDate.addSecs(GetDurationForPrice(cfg, price) * 60).toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
qCritical() << __func__ << ":" << __LINE__ << "NOT YET IMPLEMENTED";
|
||||
return "";
|
||||
qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -187,67 +200,6 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
|
||||
}
|
||||
|
||||
|
||||
CalcState Calculator::isParkingAllowed(Configuration const *cfg, QDateTime const &start) {
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
|
||||
if (paymentMethodId == PaymentMethod::Steps) {
|
||||
int const weekdayId = start.date().dayOfWeek();
|
||||
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
|
||||
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());
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////
|
||||
@ -271,13 +223,23 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
|
||||
} else {
|
||||
if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
|
||||
if (!prepaid) {
|
||||
CalcState cs = isParkingAllowed(cfg, start_datetime);
|
||||
if (cs) {
|
||||
end_datetime = start_datetime.addSecs(durationMinutes*60);
|
||||
double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
|
||||
end_datetime = start_datetime;
|
||||
end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
|
||||
return cost;
|
||||
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
|
||||
if (businessHours == BusinessHours::OnlyWeekDays) {
|
||||
int const weekdayId = start_datetime.date().dayOfWeek();
|
||||
|
||||
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
|
||||
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
|
||||
|
||||
for (WTIterator itr = p.first; itr != p.second; ++itr) {
|
||||
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
|
||||
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
|
||||
QTime const &startTime = start_datetime.time();
|
||||
|
||||
if (from <= startTime && startTime <= until) {
|
||||
end_datetime = start_datetime.addSecs(durationMinutes*60);
|
||||
return GetCostFromDuration(cfg, start_datetime, end_datetime);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -354,24 +354,22 @@ bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymen
|
||||
}
|
||||
|
||||
PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
|
||||
if (cfg->PaymentOption.size() == 0) {
|
||||
if (cfg->PaymentOption.size() != 1) {
|
||||
return PaymentMethod::Undefined;
|
||||
}
|
||||
|
||||
std::multimap<int, ATBPaymentOption>::const_iterator it =
|
||||
cfg->PaymentOption.cbegin();
|
||||
|
||||
if (it != cfg->PaymentOption.cend()) {
|
||||
switch (it->first) {
|
||||
case PaymentMethod::Linear:
|
||||
return PaymentMethod::Linear;
|
||||
case PaymentMethod::Steps:
|
||||
return PaymentMethod::Steps;
|
||||
case PaymentMethod::Degressive:
|
||||
return PaymentMethod::Degressive;
|
||||
case PaymentMethod::Progressive:
|
||||
return PaymentMethod::Progressive;
|
||||
}
|
||||
switch (it->first) {
|
||||
case PaymentMethod::Linear:
|
||||
return PaymentMethod::Linear;
|
||||
case PaymentMethod::Steps:
|
||||
return PaymentMethod::Steps;
|
||||
case PaymentMethod::Degressive:
|
||||
return PaymentMethod::Degressive;
|
||||
case PaymentMethod::Progressive:
|
||||
return PaymentMethod::Progressive;
|
||||
}
|
||||
|
||||
return PaymentMethod::Undefined;
|
||||
@ -405,22 +403,18 @@ uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod
|
||||
|
||||
BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) {
|
||||
int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours;
|
||||
|
||||
qCritical() << __func__ << ":" << __LINE__ << businessHours;
|
||||
|
||||
switch (businessHours) {
|
||||
case NoRestriction_24_7: return BusinessHours::NoRestriction_24_7;
|
||||
case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays;
|
||||
case OnlyWeekDays: return BusinessHours::OnlyWeekDays;
|
||||
case OnlyWeekEnd: return BusinessHours::OnlyWeekEnd;
|
||||
case OnlyOfficialHolidays: return BusinessHours::OnlyOfficialHolidays;
|
||||
case OnlySpecialDays: return BusinessHours::OnlySpecialDays;
|
||||
case OnlySchoolHolidays: return BusinessHours::OnlySchoolHolidays;
|
||||
case SpecialAndSchoolHolidays: return BusinessHours::SpecialAndSchoolHolidays;
|
||||
case OnlyOpenForBusinessDays: return BusinessHours::OnlyOpenForBusinessDays;
|
||||
case AllDaysWithRestrictedHours: return BusinessHours::AllDaysWithRestrictedHours;
|
||||
case NoRestriction_24_7: return NoRestriction_24_7;
|
||||
case OnlyWorkingDays: return OnlyWorkingDays;
|
||||
case OnlyWeekDays: return OnlyWeekDays;
|
||||
case OnlyWeekEnd: return OnlyWeekEnd;
|
||||
case OnlyOfficialHolidays: return OnlyOfficialHolidays;
|
||||
case OnlySpecialDays: return OnlySpecialDays;
|
||||
case OnlySchoolHolidays: return OnlySchoolHolidays;
|
||||
case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays;
|
||||
case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays;
|
||||
}
|
||||
return BusinessHours::NoBusinessHoursDefined;
|
||||
return NoBusinessHoursDefined;
|
||||
}
|
||||
|
||||
uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {
|
||||
|
||||
@ -136,11 +136,9 @@ int main() {
|
||||
QDateTime s(QDate(2023, 11, 30), QTime());
|
||||
QDateTime end;
|
||||
struct price_t price;
|
||||
memset(&price, 0, sizeof(struct price_t));
|
||||
for (int offset = 480; offset < 1080; ++offset) {
|
||||
QDateTime start = s.addSecs(offset * 60);
|
||||
|
||||
// qCritical() << QString(Calculator::GetInstance().isParkingAllowed(&cfg, start));
|
||||
|
||||
CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
|
||||
PERMIT_TYPE::DAY_TICKET_ADULT, &price);
|
||||
qCritical() << "start=" << start.toString(Qt::ISODate)
|
||||
@ -158,12 +156,13 @@ int main() {
|
||||
#endif
|
||||
|
||||
#if NEUHAUSER_LINSINGER_MASCHINENBAU==1
|
||||
std::ifstream input("/opt/ptu5/opt/customer_741/etc/psa_tariff/tariff01.json");
|
||||
std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json");
|
||||
|
||||
std::stringstream sstr;
|
||||
while(input >> sstr.rdbuf());
|
||||
std::string json(sstr.str());
|
||||
|
||||
Calculator calculator;
|
||||
Configuration cfg;
|
||||
|
||||
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
|
||||
@ -182,14 +181,14 @@ int main() {
|
||||
QDateTime start = s.addSecs(offset * 60);
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate);
|
||||
|
||||
double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
|
||||
double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
|
||||
//qCritical() << "";
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
// << "end" << end.toString(Qt::ISODate)
|
||||
// << "duration" << marken[duration]
|
||||
// << "cost" << cost;
|
||||
|
||||
std::string d = Calculator::GetInstance().GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
|
||||
std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
|
||||
qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
<< "cost" << cost
|
||||
<< "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user