Compare commits

..

9 Commits

6 changed files with 142 additions and 65 deletions

View File

@ -3,6 +3,7 @@
#include <time.h> #include <time.h>
#include <inttypes.h> #include <inttypes.h>
#include "tariff_time_range.h"
#include <QString> #include <QString>
#include <QDateTime> #include <QDateTime>
@ -31,6 +32,11 @@ struct CALCULATE_LIBRARY_API price_t {
double brutto; double brutto;
double vat_percentage; double vat_percentage;
double vat; double vat;
explicit price_t() {
units = 0;
netto = brutto = vat_percentage = vat = 0.0;
}
}; };
enum class PERMIT_TYPE : quint8 { enum class PERMIT_TYPE : quint8 {
@ -63,8 +69,25 @@ struct CALCULATE_LIBRARY_API CalcState {
State m_status; State m_status;
QString m_desc; QString m_desc;
TariffTimeRange m_allowedTimeRange;
explicit CalcState() : m_status(State::SUCCESS), m_desc("") {} 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 operator bool() const noexcept { explicit operator bool() const noexcept {
return (m_status == State::SUCCESS); return (m_status == State::SUCCESS);
@ -108,6 +131,7 @@ struct CALCULATE_LIBRARY_API CalcState {
break; break;
case State::WRONG_ISO_TIME_FORMAT: case State::WRONG_ISO_TIME_FORMAT:
s = "WRONG_ISO_TIME_FORMAT"; s = "WRONG_ISO_TIME_FORMAT";
break;
case State::OUTSIDE_ALLOWED_PARKING_TIME: case State::OUTSIDE_ALLOWED_PARKING_TIME:
s = "OUTSIDE_ALLOWED_PARKING_TIME"; s = "OUTSIDE_ALLOWED_PARKING_TIME";
} }
@ -116,6 +140,14 @@ struct CALCULATE_LIBRARY_API CalcState {
CalcState &set(State s) { m_status = s; return *this; } CalcState &set(State s) { m_status = s; return *this; }
CalcState &setDesc(QString s) { m_desc = 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, CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,

View File

@ -35,6 +35,8 @@ public:
void ResetPriceSteps() { m_priceSteps.clear(); } void ResetPriceSteps() { m_priceSteps.clear(); }
QList<int> priceSteps() const { return m_priceSteps; } QList<int> priceSteps() const { return m_priceSteps; }
CalcState isParkingAllowed(Configuration const *cfg, QDateTime const &start);
/// <summary> /// <summary>
/// Gets duration in seconds from cost /// Gets duration in seconds from cost
/// </summary> /// </summary>

View File

@ -311,7 +311,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME); return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
} }
if (duration == 0) { if (duration == 0) {
memset(price, 0x00, sizeof(*price));
return calcState.set(CalcState::State::SUCCESS); return calcState.set(CalcState::State::SUCCESS);
} }
@ -375,7 +374,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME); return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
} }
if (netto_parking_time == 0) { if (netto_parking_time == 0) {
memset(price, 0x00, sizeof(*price));
return calcState.set(CalcState::State::SUCCESS); return calcState.set(CalcState::State::SUCCESS);
} }

View File

@ -134,30 +134,17 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60); inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
return inputDate.toString(Qt::ISODate).toStdString(); return inputDate.toString(Qt::ISODate).toStdString();
} else { } else {
QDateTime const &start = QDateTime::fromString(start_datetime, Qt::ISODate); if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
if (Utilities::IsYearPeriodActive(cfg, start)) {
if (!prepaid) { if (!prepaid) {
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId); CalcState cs = isParkingAllowed(cfg, inputDate);
if (businessHours == BusinessHours::OnlyWeekDays) { if (cs) {
int const weekdayId = start.date().dayOfWeek(); inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
return inputDate.toString(Qt::ISODate).toStdString();
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() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED"; qCritical() << __func__ << ":" << __LINE__ << "NOT YET IMPLEMENTED";
return 0; return "";
} }
} }
} }
@ -200,6 +187,67 @@ 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());
}
/////////////////////////////////////// ///////////////////////////////////////
@ -223,23 +271,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
} else { } else {
if (Utilities::IsYearPeriodActive(cfg, start_datetime)) { if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
if (!prepaid) { if (!prepaid) {
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId); CalcState cs = isParkingAllowed(cfg, start_datetime);
if (businessHours == BusinessHours::OnlyWeekDays) { if (cs) {
int const weekdayId = start_datetime.date().dayOfWeek(); end_datetime = start_datetime.addSecs(durationMinutes*60);
double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator; end_datetime = start_datetime;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId); end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
return cost;
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);
}
}
} }
} }

View File

@ -354,22 +354,24 @@ bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymen
} }
PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) { PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
if (cfg->PaymentOption.size() != 1) { if (cfg->PaymentOption.size() == 0) {
return PaymentMethod::Undefined; return PaymentMethod::Undefined;
} }
std::multimap<int, ATBPaymentOption>::const_iterator it = std::multimap<int, ATBPaymentOption>::const_iterator it =
cfg->PaymentOption.cbegin(); cfg->PaymentOption.cbegin();
switch (it->first) { if (it != cfg->PaymentOption.cend()) {
case PaymentMethod::Linear: switch (it->first) {
return PaymentMethod::Linear; case PaymentMethod::Linear:
case PaymentMethod::Steps: return PaymentMethod::Linear;
return PaymentMethod::Steps; case PaymentMethod::Steps:
case PaymentMethod::Degressive: return PaymentMethod::Steps;
return PaymentMethod::Degressive; case PaymentMethod::Degressive:
case PaymentMethod::Progressive: return PaymentMethod::Degressive;
return PaymentMethod::Progressive; case PaymentMethod::Progressive:
return PaymentMethod::Progressive;
}
} }
return PaymentMethod::Undefined; return PaymentMethod::Undefined;
@ -403,18 +405,22 @@ uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod
BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) { BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) {
int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours; int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours;
qCritical() << __func__ << ":" << __LINE__ << businessHours;
switch (businessHours) { switch (businessHours) {
case NoRestriction_24_7: return NoRestriction_24_7; case NoRestriction_24_7: return BusinessHours::NoRestriction_24_7;
case OnlyWorkingDays: return OnlyWorkingDays; case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays;
case OnlyWeekDays: return OnlyWeekDays; case OnlyWeekDays: return BusinessHours::OnlyWeekDays;
case OnlyWeekEnd: return OnlyWeekEnd; case OnlyWeekEnd: return BusinessHours::OnlyWeekEnd;
case OnlyOfficialHolidays: return OnlyOfficialHolidays; case OnlyOfficialHolidays: return BusinessHours::OnlyOfficialHolidays;
case OnlySpecialDays: return OnlySpecialDays; case OnlySpecialDays: return BusinessHours::OnlySpecialDays;
case OnlySchoolHolidays: return OnlySchoolHolidays; case OnlySchoolHolidays: return BusinessHours::OnlySchoolHolidays;
case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays; case SpecialAndSchoolHolidays: return BusinessHours::SpecialAndSchoolHolidays;
case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays; case OnlyOpenForBusinessDays: return BusinessHours::OnlyOpenForBusinessDays;
case AllDaysWithRestrictedHours: return BusinessHours::AllDaysWithRestrictedHours;
} }
return NoBusinessHoursDefined; return BusinessHours::NoBusinessHoursDefined;
} }
uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) { uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {

View File

@ -136,9 +136,11 @@ int main() {
QDateTime s(QDate(2023, 11, 30), QTime()); QDateTime s(QDate(2023, 11, 30), QTime());
QDateTime end; QDateTime end;
struct price_t price; struct price_t price;
memset(&price, 0, sizeof(struct price_t));
for (int offset = 480; offset < 1080; ++offset) { for (int offset = 480; offset < 1080; ++offset) {
QDateTime start = s.addSecs(offset * 60); QDateTime start = s.addSecs(offset * 60);
// qCritical() << QString(Calculator::GetInstance().isParkingAllowed(&cfg, start));
CalcState cs = compute_price_for_daily_ticket(&cfg, start, end, CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
PERMIT_TYPE::DAY_TICKET_ADULT, &price); PERMIT_TYPE::DAY_TICKET_ADULT, &price);
qCritical() << "start=" << start.toString(Qt::ISODate) qCritical() << "start=" << start.toString(Qt::ISODate)
@ -156,13 +158,12 @@ int main() {
#endif #endif
#if NEUHAUSER_LINSINGER_MASCHINENBAU==1 #if NEUHAUSER_LINSINGER_MASCHINENBAU==1
std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json"); std::ifstream input("/opt/ptu5/opt/customer_741/etc/psa_tariff/tariff01.json");
std::stringstream sstr; std::stringstream sstr;
while(input >> sstr.rdbuf()); while(input >> sstr.rdbuf());
std::string json(sstr.str()); std::string json(sstr.str());
Calculator calculator;
Configuration cfg; Configuration cfg;
bool isParsed = cfg.ParseJson(&cfg, json.c_str()); bool isParsed = cfg.ParseJson(&cfg, json.c_str());
@ -181,14 +182,14 @@ int main() {
QDateTime start = s.addSecs(offset * 60); QDateTime start = s.addSecs(offset * 60);
//qCritical() << "start" << start.toString(Qt::ISODate); //qCritical() << "start" << start.toString(Qt::ISODate);
double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid); double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
//qCritical() << ""; //qCritical() << "";
//qCritical() << "start" << start.toString(Qt::ISODate) //qCritical() << "start" << start.toString(Qt::ISODate)
// << "end" << end.toString(Qt::ISODate) // << "end" << end.toString(Qt::ISODate)
// << "duration" << marken[duration] // << "duration" << marken[duration]
// << "cost" << cost; // << "cost" << cost;
std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost); std::string d = Calculator::GetInstance().GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
qCritical() << "start" << start.toString(Qt::ISODate) qCritical() << "start" << start.toString(Qt::ISODate)
<< "cost" << cost << "cost" << cost
<< "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60; << "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;