Compare commits
No commits in common. "c2a8f0b00bbe439745a60c62fe2cbba88e205b94" and "cc702a413efc2672c3e1ac3a842b5a77e4c1cf4c" have entirely different histories.
c2a8f0b00b
...
cc702a413e
@ -33,17 +33,6 @@ struct CALCULATE_LIBRARY_API price_t {
|
||||
double vat;
|
||||
};
|
||||
|
||||
enum class PERMIT_TYPE : quint8 {
|
||||
SHORT_TERM_PARKING,
|
||||
DAY_TICKET,
|
||||
SZEGED_START,
|
||||
SZEGED_STOP,
|
||||
DAY_TICKET_ADULT,
|
||||
DAY_TICKET_TEEN,
|
||||
DAY_TICKET_CHILD,
|
||||
INVALID
|
||||
};
|
||||
|
||||
struct CALCULATE_LIBRARY_API CalcState {
|
||||
enum class State : uint8_t {
|
||||
SUCCESS,
|
||||
@ -86,7 +75,7 @@ struct CALCULATE_LIBRARY_API CalcState {
|
||||
break;
|
||||
case State::NEGATIVE_PARING_TIME:
|
||||
s = "NEGATIVE_PARKING_TIME";
|
||||
break;
|
||||
break;
|
||||
case State::ABOVE_MAX_PARKING_TIME:
|
||||
s = "ABOVE_MAX_PARKING_TIME";
|
||||
break;
|
||||
@ -122,12 +111,6 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
|
||||
|
||||
int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
|
||||
|
||||
QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
|
||||
int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
|
||||
int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
|
||||
int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
|
||||
int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
|
||||
|
||||
CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket( // deprecated
|
||||
parking_tariff_t *tariff,
|
||||
time_t start_parking_time,
|
||||
@ -157,13 +140,6 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
|
||||
parking_tariff_t *tariff,
|
||||
QDateTime const &start_parking_time,
|
||||
QDateTime &ticketEndTime);
|
||||
|
||||
CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
|
||||
parking_tariff_t *tariff,
|
||||
QDateTime const &start_parking_time,
|
||||
QDateTime &ticketEndTime,
|
||||
PERMIT_TYPE permitType,
|
||||
struct price_t *price);
|
||||
//#ifdef __cplusplus
|
||||
//} // extern "C"
|
||||
//#endif
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
#include <optional>
|
||||
|
||||
#include "configuration.h"
|
||||
#include "calculate_price.h"
|
||||
#include "payment_method.h"
|
||||
#include "ticket.h"
|
||||
#include "tariff_time_range.h"
|
||||
@ -14,26 +13,36 @@
|
||||
using namespace std;
|
||||
|
||||
class Calculator {
|
||||
mutable QList<int> m_timeSteps;
|
||||
mutable QList<int> m_priceSteps;
|
||||
|
||||
protected:
|
||||
explicit Calculator() = default;
|
||||
|
||||
QDateTime m_start;
|
||||
mutable uint16_t m_timeStepCompensation = 0;
|
||||
public:
|
||||
Calculator(Calculator const &other) = delete;
|
||||
void operator=(Calculator const &) = delete;
|
||||
|
||||
static Calculator &GetInstance() {
|
||||
static Calculator c;
|
||||
return c;
|
||||
explicit Calculator() = default;
|
||||
explicit Calculator(QDateTime const start) : m_start(start) {
|
||||
m_start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
|
||||
qCritical() << "init m_start time:" << m_start.toString(Qt::ISODate);
|
||||
}
|
||||
|
||||
void ResetTimeSteps() { m_timeSteps.clear(); }
|
||||
QList<int> timeSteps() const { return m_timeSteps; }
|
||||
void setStartDateTime(QDateTime const &start) {
|
||||
m_start = start;
|
||||
m_start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
|
||||
qCritical() << "set m_start time:" << m_start.toString(Qt::ISODate);
|
||||
}
|
||||
|
||||
void ResetPriceSteps() { m_priceSteps.clear(); }
|
||||
QList<int> priceSteps() const { return m_priceSteps; }
|
||||
QDateTime const &getStartDateTime() const {
|
||||
return m_start;
|
||||
}
|
||||
|
||||
QDateTime &getStartDateTime() {
|
||||
return m_start;
|
||||
}
|
||||
|
||||
void setTimeStepCompensation(uint16_t timeStepCompensation) {
|
||||
m_timeStepCompensation = timeStepCompensation;
|
||||
}
|
||||
|
||||
uint16_t getTimeStepCompensation() const {
|
||||
return m_timeStepCompensation;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets duration in seconds from cost
|
||||
@ -58,7 +67,6 @@ public:
|
||||
|
||||
// Daily ticket
|
||||
QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
|
||||
std::optional<struct price_t> GetDailyTicketPrice(Configuration* cfg, QDateTime const &startDatetime, QDateTime &endTime, PERMIT_TYPE permitType);
|
||||
|
||||
//
|
||||
// helper function to find time steps for a tariff with PaymentMethod::Steps
|
||||
@ -67,8 +75,6 @@ public:
|
||||
QList<int> GetTimeSteps(Configuration *cfg) const;
|
||||
QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); }
|
||||
|
||||
QList<int> GetPriceSteps(Configuration *cfg) const;
|
||||
|
||||
// additional helper functions
|
||||
bool noSpecialDays(Configuration const *cfg) const {
|
||||
return (cfg->SpecialDays.size() == 0) && (cfg->SpecialDaysWorktime.size() == 0);
|
||||
@ -83,12 +89,12 @@ public:
|
||||
}
|
||||
|
||||
// testing public:
|
||||
private:
|
||||
// Introduced for PaymentMethod::Steps (e.g. Schoenau)
|
||||
// For tariff of following structure: only steps, no special days, nonstop.
|
||||
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
|
||||
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
|
||||
|
||||
private:
|
||||
Ticket private_GetCostFromDuration(Configuration const* cfg,
|
||||
QDateTime const &start,
|
||||
int durationMinutes,
|
||||
|
||||
@ -26,12 +26,10 @@
|
||||
#include "tariff_timestep_config.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <optional>
|
||||
|
||||
using namespace std;
|
||||
using namespace rapidjson;
|
||||
|
||||
class Calculator;
|
||||
class Configuration
|
||||
{
|
||||
public:
|
||||
@ -51,8 +49,6 @@ public:
|
||||
multimap<int, ATBDailyTicket> DailyTicket;
|
||||
multimap<int, ATBTimeRange> TimeRange;
|
||||
multimap<int, ATBTimeStepConfig> TimeStepConfig;
|
||||
multimap<int, ATBTimeBase> TimeBase;
|
||||
multimap<int, ATBCustomer> Customer;
|
||||
|
||||
/// <summary>
|
||||
/// Parse JSON string
|
||||
@ -61,16 +57,8 @@ public:
|
||||
/// <returns>Returns operation status bool (OK | FAIL) </returns>
|
||||
bool ParseJson(Configuration* cfg, const char* json);
|
||||
|
||||
ATBPaymentOption &getPaymentOptions();
|
||||
ATBPaymentOption const &getPaymentOptions() const;
|
||||
QVector<ATBPaymentOption> &getAllPaymentOptions();
|
||||
QVector<ATBPaymentOption> const &getAllPaymentOptions() const;
|
||||
std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
|
||||
std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
|
||||
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
|
||||
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
|
||||
std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
|
||||
std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
|
||||
ATBPaymentOption const &getPaymentOptions();
|
||||
QVector<ATBDailyTicket> const &getDailyTickets() const;
|
||||
|
||||
private:
|
||||
/// <summary>
|
||||
@ -80,5 +68,5 @@ private:
|
||||
/// <returns></returns>
|
||||
MemberType IdentifyJsonMember(const char* member_name);
|
||||
|
||||
QVector<ATBPaymentOption> currentPaymentOptions;
|
||||
ATBPaymentOption currentPaymentOptions;
|
||||
};
|
||||
|
||||
@ -6,23 +6,6 @@ class ATBPaymentOption
|
||||
public:
|
||||
ATBPaymentOption() = default;
|
||||
|
||||
void reset() {
|
||||
pop_id = 0;
|
||||
pop_label = "";
|
||||
pop_payment_method_id = 0;
|
||||
pop_day_end_time = "";
|
||||
pop_day_night_end_time = "";
|
||||
pop_price_night = 0;
|
||||
pop_min_time = 0;
|
||||
pop_max_time = 0;
|
||||
pop_min_price = 0;
|
||||
pop_carry_over = -1;
|
||||
pop_carry_over_time_range_id = -1;
|
||||
pop_daily_card_price = -1;
|
||||
pop_business_hours = -1;
|
||||
pop_time_step_config = -1;
|
||||
}
|
||||
|
||||
int pop_id;
|
||||
std::string pop_label;
|
||||
int pop_payment_method_id;
|
||||
|
||||
@ -15,7 +15,6 @@ enum BusinessHours
|
||||
OnlySchoolHolidays = 32,
|
||||
SpecialAndSchoolHolidays = 48,
|
||||
OnlyOpenForBusinessDays = 64, // verkaufsoffen
|
||||
AllDaysWithRestrictedHours = 128, // every day, restricted to some time range
|
||||
NoBusinessHoursDefined = 255
|
||||
};
|
||||
|
||||
|
||||
@ -10,31 +10,25 @@ struct ATBCustomer {
|
||||
|
||||
ATBCustomer() = default;
|
||||
|
||||
int cust_id;
|
||||
CustomerType cust_type;
|
||||
QString cust_label;
|
||||
|
||||
friend QDebug operator<<(QDebug debug, ATBCustomer const &customer) {
|
||||
QDebugStateSaver saver(debug);
|
||||
|
||||
debug.nospace() << "CUSTOMER" << "\n";
|
||||
|
||||
switch(customer.cust_type) {
|
||||
case ATBCustomer::CustomerType::ADULT:
|
||||
debug.nospace()
|
||||
<< " cust_id: " << customer.cust_id << "\n"
|
||||
<< " cust_type: " << "CustomerType::ADULT" << "\n"
|
||||
<< "cust_label: " << customer.cust_label << "\n";
|
||||
break;
|
||||
case ATBCustomer::CustomerType::CHILD:
|
||||
debug.nospace()
|
||||
<< " cust_id: " << customer.cust_id << "\n"
|
||||
<< " cust_type: " << "CustomerType::CHILD" << "\n"
|
||||
<< "cust_label: " << customer.cust_label << "\n";
|
||||
break;
|
||||
case ATBCustomer::CustomerType::TEEN:
|
||||
debug.nospace()
|
||||
<< " cust_id: " << customer.cust_id << "\n"
|
||||
<< " cust_type: " << "CustomerType::TEEN" << "\n"
|
||||
<< "cust_label: " << customer.cust_label << "\n";
|
||||
break;
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
#include <QVector>
|
||||
#include <QDebugStateSaver>
|
||||
|
||||
|
||||
@ -16,49 +15,65 @@ struct ATBDailyTicket {
|
||||
ATBDailyTicket() = default;
|
||||
|
||||
int daily_ticket_payment_option_id;
|
||||
int daily_ticket_id;
|
||||
int daily_ticket_price_id;
|
||||
int daily_ticket_unit_id;
|
||||
double daily_ticket_price;
|
||||
|
||||
int daily_ticket_tb_id;
|
||||
ATBTimeBase::TimeBaseType daily_ticket_tbase_type;
|
||||
// time base setting for ticket:
|
||||
// absolute: using time stamps
|
||||
// relative: use offsets from
|
||||
// some reference time point,
|
||||
// typically "start time".
|
||||
|
||||
QVector<int> daily_ticket_clearance_customer_ids;
|
||||
ATBCustomer::CustomerType daily_ticket_clearance_customer_type;
|
||||
// who is allowed to buy the ticket:
|
||||
// list of customer types
|
||||
|
||||
QTime daily_ticket_from_min; // absolute time base
|
||||
QTime daily_ticket_to_max;
|
||||
int daily_ticket_from_offset_min; // relative time base
|
||||
int daily_ticket_to_offset_max;
|
||||
int daily_ticket_weekday_range; // [mon-sun]
|
||||
int daily_ticket_special_day_range;
|
||||
|
||||
void reset() {
|
||||
daily_ticket_payment_option_id = 0;
|
||||
daily_ticket_id = 0;
|
||||
daily_ticket_price_id = 0;
|
||||
daily_ticket_tb_id = 0;
|
||||
daily_ticket_clearance_customer_ids.clear();
|
||||
daily_ticket_from_min = QTime();
|
||||
daily_ticket_to_max = QTime();
|
||||
daily_ticket_from_offset_min = 0;
|
||||
daily_ticket_to_offset_max = 0;
|
||||
}
|
||||
|
||||
friend QDebug operator<<(QDebug debug, ATBDailyTicket const &ticket) {
|
||||
QDebugStateSaver saver(debug);
|
||||
|
||||
debug.nospace()
|
||||
<< "DAILY TICKET " << "\n"
|
||||
<< " daily_ticket_id: " << ticket.daily_ticket_id << "\n"
|
||||
<< " daily_ticket_payment_option_id: " << ticket.daily_ticket_payment_option_id << "\n"
|
||||
<< " daily_ticket_tbase_id: " << ticket.daily_ticket_tb_id << "\n"
|
||||
<< " daily_ticket_price_id: " << ticket.daily_ticket_price_id << "\n"
|
||||
<< "daily_ticket_clearance_customer_ids: " << ticket.daily_ticket_clearance_customer_ids << "\n"
|
||||
<< " daily_ticket_from_min: " << ticket.daily_ticket_from_min.toString(Qt::ISODate) << "\n"
|
||||
<< " daily_ticket_to_min: " << ticket.daily_ticket_to_max.toString(Qt::ISODate) << "\n";
|
||||
<< " daily_ticket_payment_option_id: " << ticket.daily_ticket_payment_option_id << "\n"
|
||||
<< " daily_ticket_unit_id: " << ticket.daily_ticket_unit_id << "\n"
|
||||
<< " daily_ticket_price: " << ticket.daily_ticket_price << "\n";
|
||||
|
||||
switch(ticket.daily_ticket_tbase_type) {
|
||||
case ATBTimeBase::TimeBaseType::ABSOLUTE:
|
||||
debug.nospace()
|
||||
<< " daily_ticket_tbase_type: " << "TimeBaseType::ABSOLUTE" << "\n";
|
||||
break;
|
||||
case ATBTimeBase::TimeBaseType::RELATIVE:
|
||||
debug.nospace()
|
||||
<< " daily_ticket_tbase_type: " << "TimeBaseType::RELATIVE" << "\n";
|
||||
break;
|
||||
}
|
||||
|
||||
switch(ticket.daily_ticket_clearance_customer_type) {
|
||||
case ATBCustomer::CustomerType::ADULT:
|
||||
debug.nospace()
|
||||
<< "daily_ticket_clearance_customer_type: " << "CustomerType::ADULT" << "\n";
|
||||
break;
|
||||
case ATBCustomer::CustomerType::CHILD:
|
||||
debug.nospace()
|
||||
<< "daily_ticket_clearance_customer_type: " << "CustomerType::CHILD" << "\n";
|
||||
break;
|
||||
case ATBCustomer::CustomerType::TEEN:
|
||||
debug.nospace()
|
||||
<< "daily_ticket_clearance_customer_type: " << "CustomerType::TEEN" << "\n";
|
||||
break;
|
||||
default:
|
||||
debug.nospace()
|
||||
<< "daily_ticket_clearance_customer_type: " << "CustomerType::???" << "\n";
|
||||
break;
|
||||
}
|
||||
|
||||
debug.nospace()
|
||||
<< " daily_ticket_weekday_range: " << ticket.daily_ticket_weekday_range << "\n"
|
||||
<< " daily_ticket_special_day_range: " << ticket.daily_ticket_special_day_range << "\n";
|
||||
|
||||
return debug;
|
||||
}
|
||||
|
||||
@ -16,8 +16,6 @@ struct ATBTimeBase {
|
||||
friend QDebug operator<<(QDebug debug, ATBTimeBase const &timeBase) {
|
||||
QDebugStateSaver saver(debug);
|
||||
|
||||
debug.nospace() << "TIMEBASE" << "\n";
|
||||
|
||||
switch(timeBase.tbase_type) {
|
||||
case ATBTimeBase::TimeBaseType::ABSOLUTE:
|
||||
debug.nospace()
|
||||
|
||||
@ -9,8 +9,7 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
|
||||
INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
|
||||
|
||||
#start version with project neuhauser/galtuer
|
||||
#Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
|
||||
#VERSION=1.0.0
|
||||
VERSION=1.0.0
|
||||
|
||||
CONFIG(debug, debug|release) {
|
||||
win32 {
|
||||
|
||||
@ -8,101 +8,8 @@
|
||||
#include <QFileInfo>
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
#include <QList>
|
||||
|
||||
QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
|
||||
return Calculator::GetInstance().GetTimeSteps(cfg);
|
||||
}
|
||||
|
||||
int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType) {
|
||||
int minTime = 0;
|
||||
|
||||
switch(permitType) {
|
||||
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
|
||||
minTime = cfg->getPaymentOptions().pop_min_time;
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_ADULT: {
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_TEEN: {
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_CHILD: {
|
||||
} break;
|
||||
default:
|
||||
// for each new sell-procedure, recomute the timesteps. implicitly, set
|
||||
// the minimal parking time.
|
||||
Calculator::GetInstance().ResetTimeSteps();
|
||||
Calculator::GetInstance().GetTimeSteps(cfg);
|
||||
minTime = qRound(cfg->getPaymentOptions().pop_min_time);
|
||||
}
|
||||
|
||||
return minTime;
|
||||
}
|
||||
|
||||
int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType) {
|
||||
int maxTime = 0;
|
||||
|
||||
switch(permitType) {
|
||||
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
|
||||
maxTime = cfg->getPaymentOptions().pop_max_time;
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_ADULT: {
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_TEEN: {
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_CHILD: {
|
||||
} break;
|
||||
default: ;
|
||||
}
|
||||
|
||||
return maxTime;
|
||||
}
|
||||
|
||||
int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
|
||||
int minPrice = -1;
|
||||
|
||||
switch(permitType) {
|
||||
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
|
||||
minPrice = cfg->getPaymentOptions().pop_min_price;
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_ADULT: {
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_TEEN: {
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_CHILD: {
|
||||
} break;
|
||||
default: ;
|
||||
}
|
||||
|
||||
return minPrice;
|
||||
}
|
||||
|
||||
int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
|
||||
int maxPrice = -1;
|
||||
|
||||
switch(permitType) {
|
||||
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
|
||||
int const key = cfg->getPaymentOptions().pop_id;
|
||||
int const maxTime = cfg->getPaymentOptions().pop_max_time; // maxTime is given in minutes
|
||||
std::optional<QVector<ATBPaymentRate>> const &pv = cfg->getPaymentRateForKey(key);
|
||||
if (pv) {
|
||||
QVector<ATBPaymentRate> const &paymentRate = pv.value();
|
||||
if (paymentRate.size() > 0) {
|
||||
int const price = paymentRate.at(0).pra_price; // price is given per hour
|
||||
maxPrice = qRound((maxTime * price) / 60.0f);
|
||||
}
|
||||
}
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_ADULT:
|
||||
break;
|
||||
case PERMIT_TYPE::DAY_TICKET_TEEN:
|
||||
break;
|
||||
case PERMIT_TYPE::DAY_TICKET_CHILD:
|
||||
break;
|
||||
default: ;
|
||||
}
|
||||
|
||||
return maxPrice;
|
||||
}
|
||||
static Calculator calculator;
|
||||
|
||||
int CALCULATE_LIBRARY_API get_zone_nr(int zone)
|
||||
{
|
||||
@ -190,9 +97,7 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
|
||||
// UpDown 1 -> up; 0 -> down
|
||||
int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
|
||||
{
|
||||
qCritical() << " compute_next_timestep() currentTimeMinutes: " << currentTimeMinutes;
|
||||
qCritical() << " compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
|
||||
|
||||
qCritical() << " compute_next_timestep() currentTimeMinutes: " << currentTimeMinutes;
|
||||
Configuration const *cfg = tariff;
|
||||
|
||||
// compute payment method id (e.g. Linear=3, Steps=4)
|
||||
@ -219,8 +124,7 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
|
||||
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
|
||||
if (paymentMethodId == PaymentMethod::Steps)
|
||||
{
|
||||
const QList<int> stepList = Calculator::GetInstance().GetTimeSteps(tariff);
|
||||
qCritical() << " compute_next_timestep() timeSteps:" << stepList;
|
||||
static const QList<int> stepList = calculator.GetTimeSteps(tariff);
|
||||
|
||||
int currentStepIndex = stepList.indexOf(currentTimeMinutes);
|
||||
|
||||
@ -321,7 +225,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
|
||||
start = start.toLocalTime().addSecs(start_parking_time * 60);
|
||||
QDateTime end(start);
|
||||
if (start.isValid()) {
|
||||
double cost = Calculator::GetInstance().GetCostFromDuration(
|
||||
double cost = calculator.GetCostFromDuration(
|
||||
tariff,
|
||||
tariff->getPaymentOptions().pop_payment_method_id,
|
||||
start,
|
||||
@ -380,7 +284,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
|
||||
}
|
||||
|
||||
if (start_parking_time.isValid()) {
|
||||
double cost = Calculator::GetInstance().GetCostFromDuration(
|
||||
double cost = calculator.GetCostFromDuration(
|
||||
tariff,
|
||||
tariff->getPaymentOptions().pop_payment_method_id,
|
||||
start_parking_time, // starting time
|
||||
@ -423,7 +327,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
|
||||
qCritical() << " start (cs): " << cs;
|
||||
qCritical() << " price: " << price;
|
||||
|
||||
duration = Calculator::GetInstance().GetDurationFromCost(tariff,
|
||||
duration = calculator.GetDurationFromCost(tariff,
|
||||
tariff->getPaymentOptions().pop_payment_method_id,
|
||||
cs.toLocal8Bit().constData(),
|
||||
price, false, true).c_str();
|
||||
@ -448,7 +352,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
|
||||
CalcState calcState;
|
||||
if (start_parking_time.isValid()) {
|
||||
QString cs = start_parking_time.toString(Qt::ISODate);
|
||||
QString endTime = Calculator::GetInstance().GetDurationFromCost(
|
||||
QString endTime = calculator.GetDurationFromCost(
|
||||
tariff,
|
||||
tariff->getPaymentOptions().pop_payment_method_id,
|
||||
cs.toLocal8Bit().constData(),
|
||||
@ -476,7 +380,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
|
||||
CalcState calcState;
|
||||
if (start_parking_time.isValid()) {
|
||||
|
||||
ticketEndTime = Calculator::GetInstance().GetDailyTicketDuration(tariff,
|
||||
ticketEndTime = calculator.GetDailyTicketDuration(tariff,
|
||||
start_parking_time,
|
||||
tariff->getPaymentOptions().pop_payment_method_id,
|
||||
false); // carry over
|
||||
@ -497,27 +401,3 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
|
||||
return calcState.set(CalcState::State::SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
|
||||
parking_tariff_t *tariff,
|
||||
QDateTime const &startDatetime,
|
||||
QDateTime &endDatetime,
|
||||
PERMIT_TYPE permitType,
|
||||
struct price_t *price) {// return value
|
||||
CalcState calcState;
|
||||
|
||||
|
||||
if (startDatetime.isValid()) {
|
||||
if (std::optional<struct price_t> p =
|
||||
Calculator::GetInstance().GetDailyTicketPrice(tariff,
|
||||
startDatetime,
|
||||
endDatetime,
|
||||
permitType)) {
|
||||
*price = p.value();
|
||||
}
|
||||
} else {
|
||||
return calcState.set(CalcState::State::INVALID_START_DATE);
|
||||
}
|
||||
return calcState.set(CalcState::State::SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
@ -695,32 +695,14 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
cost, Ticket::s[VALID]);
|
||||
}
|
||||
|
||||
QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
|
||||
return QList<int>();
|
||||
}
|
||||
|
||||
QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
||||
if (m_timeSteps.size() > 0) {
|
||||
//qCritical() << __PRETTY_FUNCTION__ << "timeSteps:" << m_timeSteps;
|
||||
return m_timeSteps;
|
||||
}
|
||||
|
||||
QDateTime start = QDateTime::currentDateTime();
|
||||
start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
|
||||
QList<int> timeSteps;
|
||||
|
||||
int const pop_id = cfg->getPaymentOptions().pop_id;
|
||||
int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
|
||||
int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
|
||||
|
||||
qCritical() << __PRETTY_FUNCTION__ << " start parking time:" << start.toString(Qt::ISODate);
|
||||
qCritical() << __PRETTY_FUNCTION__ << " payment option id:" << pop_id;
|
||||
qCritical() << __PRETTY_FUNCTION__ << " payment option carry over:" << pop_carry_over;
|
||||
|
||||
if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
|
||||
//qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
|
||||
|
||||
uint16_t timeStepCompensation = 0;
|
||||
|
||||
if (pop_carry_over) {
|
||||
int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
|
||||
QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
|
||||
@ -734,11 +716,14 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
||||
if (search != cfg->Duration.end()) {
|
||||
ATBDuration duration = search->second;
|
||||
if (durationId == 1) {
|
||||
QDateTime carryOver = start;
|
||||
//duration.pun_duration_min = search->second.pun_duration_min;
|
||||
//duration.pun_duration_max = search->second.pun_duration_max;
|
||||
|
||||
QDateTime carryOver = m_start;
|
||||
carryOver = carryOver.addDays(1);
|
||||
carryOver.setTime(QTime(0, 0, 0));
|
||||
|
||||
int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
|
||||
int const timeStep = std::ceil(m_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)")
|
||||
@ -746,19 +731,12 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
||||
.arg(timeStep).arg(duration.pun_duration_max);
|
||||
break;
|
||||
}
|
||||
qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
|
||||
|
||||
// set dynamic minimal parking time
|
||||
cfg->getPaymentOptions().pop_min_time = timeStep;
|
||||
|
||||
qCritical() << __PRETTY_FUNCTION__ << " computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
|
||||
|
||||
duration.pun_duration = timeStep;
|
||||
timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
|
||||
m_timeSteps << duration.pun_duration;
|
||||
m_timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
|
||||
timeSteps << duration.pun_duration;
|
||||
} else {
|
||||
duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
|
||||
m_timeSteps << duration.pun_duration;;
|
||||
duration.pun_duration = duration.pun_duration_max - m_timeStepCompensation;
|
||||
timeSteps << duration.pun_duration;;
|
||||
}
|
||||
|
||||
cfg->Duration.erase(search);
|
||||
@ -778,19 +756,15 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
||||
// TODO
|
||||
}
|
||||
} else {
|
||||
qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";
|
||||
|
||||
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;
|
||||
m_timeSteps << durationUnit;
|
||||
timeSteps << durationUnit;
|
||||
}
|
||||
}
|
||||
|
||||
qCritical() << __PRETTY_FUNCTION__ << "NEW timeSteps:" << m_timeSteps;
|
||||
|
||||
return m_timeSteps;
|
||||
return timeSteps;
|
||||
}
|
||||
|
||||
uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const {
|
||||
@ -836,82 +810,3 @@ uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
|
||||
|
||||
return duration;
|
||||
}
|
||||
|
||||
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) {
|
||||
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;
|
||||
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(priceId);
|
||||
if (paymentRates) {
|
||||
QVector<ATBPaymentRate> const &pr = paymentRates.value();
|
||||
if (pr.size() > 0) {
|
||||
price.netto = pr.at(0).pra_price;
|
||||
value.value_or(price);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} 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;
|
||||
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(priceId);
|
||||
if (paymentRates) {
|
||||
QVector<ATBPaymentRate> const &pr = paymentRates.value();
|
||||
if (pr.size() > 0) {
|
||||
price.netto = pr.at(0).pra_price;
|
||||
value.value_or(price);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} break;
|
||||
case PERMIT_TYPE::DAY_TICKET_CHILD: {
|
||||
}
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::SHORT_TERM_PARKING: {
|
||||
}
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::DAY_TICKET: {
|
||||
}
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::SZEGED_START:
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::SZEGED_STOP:
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::INVALID:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
@ -214,64 +214,57 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
DailyTicket.daily_ticket_payment_option_id = k->value.GetInt();
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_id")) {
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_unit_id")) {
|
||||
if (k->value.IsInt()) {
|
||||
DailyTicket.daily_ticket_id = k->value.GetInt();
|
||||
DailyTicket.daily_ticket_unit_id = k->value.GetInt();
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_price_id")) {
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_price")) {
|
||||
if (k->value.IsInt()) {
|
||||
DailyTicket.daily_ticket_price_id = k->value.GetInt();
|
||||
DailyTicket.daily_ticket_price = k->value.GetInt();
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_tb_id")) {
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_tbase_type")) {
|
||||
if (k->value.IsInt()) {
|
||||
DailyTicket.daily_ticket_tb_id = k->value.GetInt();
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_clearance_customer_ids")) {
|
||||
if (k->value.IsArray()) {
|
||||
auto customerIds = k->value.GetArray();
|
||||
for (rapidjson::SizeType i=0; i < customerIds.Size(); ++i) {
|
||||
if (customerIds[i].IsInt()) {
|
||||
DailyTicket.daily_ticket_clearance_customer_ids.append(customerIds[i].GetInt());
|
||||
}
|
||||
int baseType = k->value.GetInt();
|
||||
switch(baseType) {
|
||||
case (int)ATBTimeBase::TimeBaseType::ABSOLUTE:
|
||||
DailyTicket.daily_ticket_tbase_type = ATBTimeBase::TimeBaseType::ABSOLUTE;
|
||||
break;
|
||||
case (int)ATBTimeBase::TimeBaseType::RELATIVE:
|
||||
DailyTicket.daily_ticket_tbase_type = ATBTimeBase::TimeBaseType::RELATIVE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_from_min")) {
|
||||
if (k->value.IsString()) {
|
||||
std::string const from_min = k->value.GetString();
|
||||
char const *from_min_c_str = from_min.c_str(); // for debugging
|
||||
DailyTicket.daily_ticket_from_min = QTime::fromString(from_min_c_str, Qt::ISODate);
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_to_max")) {
|
||||
if (k->value.IsString()) {
|
||||
std::string const to_max = k->value.GetString();
|
||||
char const *to_max_c_str = to_max.c_str();
|
||||
DailyTicket.daily_ticket_to_max = QTime::fromString(to_max_c_str, Qt::ISODate);
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_from_offset_min")) {
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_clearance_customer_type")) {
|
||||
if (k->value.IsInt()) {
|
||||
int const from_offset_min = k->value.GetInt();
|
||||
DailyTicket.daily_ticket_from_offset_min = from_offset_min;
|
||||
int CustomerType = k->value.GetInt();
|
||||
switch (CustomerType) {
|
||||
case (int)ATBCustomer::CustomerType::ADULT:
|
||||
DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::ADULT;
|
||||
break;
|
||||
case (int)ATBCustomer::CustomerType::CHILD:
|
||||
DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::CHILD;
|
||||
break;
|
||||
case (int)ATBCustomer::CustomerType::TEEN:
|
||||
DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::TEEN;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_to_offset_max")) {
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_weekday_range")) {
|
||||
if (k->value.IsInt()) {
|
||||
int to_offset_max = k->value.GetInt();
|
||||
DailyTicket.daily_ticket_to_offset_max = to_offset_max;
|
||||
DailyTicket.daily_ticket_weekday_range = k->value.GetInt();
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("daily_ticket_special_day_range")) {
|
||||
if (k->value.IsInt()) {
|
||||
DailyTicket.daily_ticket_special_day_range = k->value.GetInt();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case MemberType::CustomerType:
|
||||
if (QString(inner_obj_name) == QString("cust_id")) {
|
||||
if (k->value.IsInt()) {
|
||||
Customer.cust_id = k->value.GetInt();
|
||||
}
|
||||
} else
|
||||
if (QString(inner_obj_name) == QString("cust_type")) {
|
||||
if (k->value.IsInt()) {
|
||||
int cust_type = k->value.GetInt();
|
||||
@ -334,8 +327,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
|
||||
else if (strcmp(inner_obj_name, "pop_business_hours") == 0) PaymentOption.pop_business_hours = k->value.GetInt();
|
||||
else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) PaymentOption.pop_time_step_config = k->value.GetInt();
|
||||
this->currentPaymentOptions.append(PaymentOption);
|
||||
PaymentOption.reset();
|
||||
this->currentPaymentOptions = PaymentOption;
|
||||
break;
|
||||
case MemberType::DurationType:
|
||||
if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
|
||||
@ -393,8 +385,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
case MemberType::PaymentMethodType:
|
||||
cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
|
||||
break;
|
||||
case MemberType::PaymentRateType:
|
||||
// qCritical() << "PaymentRate" << PaymentRate;
|
||||
case MemberType::PaymentRateType:
|
||||
cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
|
||||
break;
|
||||
case MemberType::PaymentOptionType:
|
||||
@ -419,25 +410,22 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
|
||||
break;
|
||||
case MemberType::DailyTicketType:
|
||||
cfg->DailyTicket.insert(pair<int, ATBDailyTicket>(DailyTicket.daily_ticket_id, DailyTicket));
|
||||
qCritical() << DailyTicket;
|
||||
DailyTicket.reset();
|
||||
// qCritical() << DailyTicket;
|
||||
break;
|
||||
case MemberType::CustomerType:
|
||||
cfg->Customer.insert(pair<int, ATBCustomer>(Customer.cust_id, Customer));
|
||||
qCritical() << Customer;
|
||||
// qCritical() << Customer;
|
||||
break;
|
||||
case MemberType::TimeBaseType:
|
||||
cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
|
||||
qCritical() << TimeBase;
|
||||
// qCritical() << TimeBase;
|
||||
cfg->TimeBase.insert(pair<int, ATBTimeRange>(TimeBase.tbase_id, TimeBase));
|
||||
break;
|
||||
case MemberType::TimeRangeType:
|
||||
cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
|
||||
// qCritical() << TimeRange;
|
||||
cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
|
||||
break;
|
||||
case MemberType::TimeStepConfigType:
|
||||
cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
|
||||
// qCritical() << TimeStepConfig;
|
||||
cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -452,127 +440,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
}
|
||||
}
|
||||
|
||||
ATBPaymentOption const &Configuration::getPaymentOptions() const {
|
||||
return this->currentPaymentOptions.at(0);
|
||||
}
|
||||
|
||||
ATBPaymentOption &Configuration::getPaymentOptions() {
|
||||
return this->currentPaymentOptions[0];
|
||||
}
|
||||
|
||||
QVector<ATBPaymentOption> const &Configuration::getAllPaymentOptions() const {
|
||||
const ATBPaymentOption & Configuration::getPaymentOptions()
|
||||
{
|
||||
return this->currentPaymentOptions;
|
||||
}
|
||||
|
||||
QVector<ATBPaymentOption> &Configuration::getAllPaymentOptions() {
|
||||
return this->currentPaymentOptions;
|
||||
}
|
||||
|
||||
std::optional<QVector<ATBDailyTicket>>
|
||||
Configuration::getDailyTicketsForAllKeys() const {
|
||||
QVector<ATBDailyTicket> tickets;
|
||||
std::optional<QVector<ATBDailyTicket>> value;
|
||||
|
||||
for (std::multimap<int, ATBDailyTicket>::const_iterator it = this->DailyTicket.cbegin();
|
||||
it != this->DailyTicket.cend(); ++it) {
|
||||
tickets.append(it->second);
|
||||
}
|
||||
|
||||
if (tickets.size() > 0) {
|
||||
value.value_or(tickets);
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
std::optional<QVector<ATBDailyTicket>>
|
||||
Configuration::getDailyTicketsForKey(int key) const {
|
||||
QVector<ATBDailyTicket> tickets;
|
||||
std::optional<QVector<ATBDailyTicket>> value;
|
||||
|
||||
std::pair<
|
||||
std::multimap<int, ATBDailyTicket>::const_iterator,
|
||||
std::multimap<int, ATBDailyTicket>::const_iterator
|
||||
> p = this->DailyTicket.equal_range(key);
|
||||
|
||||
for (std::multimap<int, ATBDailyTicket>::const_iterator it = p.first;
|
||||
it != p.second; ++it) {
|
||||
tickets.append(it->second);
|
||||
}
|
||||
|
||||
if (tickets.size() > 0) {
|
||||
value.value_or(tickets);
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
std::optional<QVector<ATBPaymentRate>>
|
||||
Configuration::getPaymentRateForAllKeys() const {
|
||||
QVector<ATBPaymentRate> paymentRates;
|
||||
std::optional<QVector<ATBPaymentRate>> value;
|
||||
|
||||
for (std::multimap<int, ATBPaymentRate>::const_iterator it = this->PaymentRate.cbegin();
|
||||
it != this->PaymentRate.cend(); ++it) {
|
||||
paymentRates.append(it->second);
|
||||
}
|
||||
|
||||
if (paymentRates.size() > 0) {
|
||||
value.value_or(paymentRates);
|
||||
}
|
||||
|
||||
return value;
|
||||
|
||||
}
|
||||
|
||||
std::optional<QVector<ATBPaymentRate>>
|
||||
Configuration::getPaymentRateForKey(int key) const {
|
||||
QVector<ATBPaymentRate> paymentRate;
|
||||
std::optional<QVector<ATBPaymentRate>> value;
|
||||
|
||||
std::pair<
|
||||
std::multimap<int, ATBPaymentRate>::const_iterator,
|
||||
std::multimap<int, ATBPaymentRate>::const_iterator
|
||||
> p = this->PaymentRate.equal_range(key);
|
||||
|
||||
for (std::multimap<int, ATBPaymentRate>::const_iterator it = p.first;
|
||||
it != p.second; ++it) {
|
||||
paymentRate.append(it->second);
|
||||
}
|
||||
|
||||
if (paymentRate.size() > 0) {
|
||||
value.value_or(paymentRate);
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
std::optional<ATBCustomer>
|
||||
Configuration::getCustomerForType(ATBCustomer::CustomerType customerType) {
|
||||
for (std::multimap<int, ATBCustomer>::const_iterator it = this->Customer.cbegin();
|
||||
it != this->Customer.cend(); ++it) {
|
||||
ATBCustomer const &customer = it->second;
|
||||
if (customer.cust_type == customerType) {
|
||||
return customer;
|
||||
}
|
||||
}
|
||||
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
std::optional<ATBWeekDaysWorktime>
|
||||
Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
|
||||
ATBWeekDaysWorktime worktime;
|
||||
std::optional<ATBWeekDaysWorktime> value;
|
||||
|
||||
std::multimap<int, ATBWeekDaysWorktime>::const_iterator it = this->WeekDaysWorktime.find((int)dayOfWeek);
|
||||
if (it != this->WeekDaysWorktime.cend()) {
|
||||
ATBWeekDaysWorktime const &wt = it->second;
|
||||
if (QTime::fromString(wt.pwd_time_from.c_str(), Qt::ISODate) >= time
|
||||
&& QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate) < time) {
|
||||
value.value_or(wt);
|
||||
}
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <QDebug>
|
||||
#include <algorithm>
|
||||
|
||||
// static int protection_counter = 0;
|
||||
static int protection_counter = 0;
|
||||
|
||||
/// <summary>
|
||||
/// Helper function
|
||||
|
||||
@ -34,59 +34,13 @@ extern "C" char* strptime(const char* s,
|
||||
#include <calculate_price.h>
|
||||
|
||||
#define SZEGED (0)
|
||||
#define SCHOENAU_KOENIGSEE (0)
|
||||
#define NEUHAUSER_KORNEUBURG (0)
|
||||
#define NEUHAUSER_LINSINGER_MASCHINENBAU (0)
|
||||
#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (1)
|
||||
#define NEUHAUSER_BILEXA_GALTUER (0)
|
||||
#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
|
||||
#define NEUHAUSER_BILEXA_GALTUER (1)
|
||||
|
||||
|
||||
int main() {
|
||||
#if SCHOENAU_KOENIGSEE==1
|
||||
QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff01.json");
|
||||
//QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff02.json");
|
||||
|
||||
std::ifstream input(f.toUtf8().constData());
|
||||
|
||||
std::stringstream sstr;
|
||||
while(input >> sstr.rdbuf());
|
||||
std::string json(sstr.str());
|
||||
|
||||
Configuration cfg;
|
||||
|
||||
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
|
||||
cout << endl;
|
||||
|
||||
if (isParsed) {
|
||||
qCritical() << "parsed" << f;
|
||||
|
||||
int minParkingTime = get_minimal_parkingtime(&cfg);
|
||||
qCritical() << "minimal_parking_time" << minParkingTime;
|
||||
|
||||
QDateTime start = QDateTime::currentDateTime();
|
||||
|
||||
// zone 1
|
||||
//int timeSteps[9] = {60, 180, 1440, 2880, 4320, 5670, 7200, 8640, 10080};
|
||||
|
||||
|
||||
// zone 2
|
||||
//int timeSteps[3] = {60, 180, 1440};
|
||||
|
||||
static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
|
||||
qCritical() << "TimeSteps" << timeSteps;
|
||||
|
||||
// for (int i = 0 ; i < timeSteps.size(); ++i) {
|
||||
// QDateTime end = start.addSecs(timeSteps.at(i)*60);
|
||||
//
|
||||
// double price = Calculator::GetInstance().GetCostFromDuration(
|
||||
// &cfg,
|
||||
// start,
|
||||
// timeSteps.at(i));
|
||||
// qDebug() << "GetCostFromDuration() time: " << timeSteps.at(i) << "price=" << price;
|
||||
//}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if NEUHAUSER_BILEXA_GALTUER==1
|
||||
std::ifstream input("/opt/ptu5/opt/customer_745/etc/psa_tariff/tariff01.json");
|
||||
|
||||
@ -100,28 +54,24 @@ int main() {
|
||||
cout << endl;
|
||||
|
||||
if (isParsed) {
|
||||
int minParkingTime = get_minimal_parkingtime(&cfg);
|
||||
QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
|
||||
QDateTime start = QDateTime::currentDateTime();
|
||||
start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
|
||||
Calculator calculator(start);
|
||||
QList<int> timeSteps = calculator.GetTimeSteps(&cfg);
|
||||
qCritical() << timeSteps;
|
||||
int Down = 0;
|
||||
int Up = 1;
|
||||
//compute_next_timestep(&cfg, )
|
||||
|
||||
for (int i=0; i<timeSteps.size(); ++i) {
|
||||
int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
|
||||
qCritical() << "nextTimeStep" << nextTimeStep;
|
||||
|
||||
// uint32_t price = calculator.GetPriceForTimeStep(&cfg, timeSteps.at(i));
|
||||
// uint32_t duration = calculator.GetDurationForPrice(&cfg, price);
|
||||
// qCritical() << "nextTimeStep relative to start:"
|
||||
// << duration << start.addSecs(duration * 60)
|
||||
// << "(price so far:" << price << ")";
|
||||
uint32_t price = calculator.GetPriceForTimeStep(&cfg, timeSteps.at(i));
|
||||
uint32_t duration = calculator.GetDurationForPrice(&cfg, price);
|
||||
qCritical() << "nextTimeStep relative to start:"
|
||||
<< duration << start.addSecs(duration * 60)
|
||||
<< "(price so far:" << price << ")";
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM==1
|
||||
std::ifstream input("/opt/ptu5/opt/customer_744/etc/psa_tariff/tariff01.json");
|
||||
std::ifstream input("/tmp/tariff_naz.json");
|
||||
|
||||
std::stringstream sstr;
|
||||
while(input >> sstr.rdbuf());
|
||||
@ -133,6 +83,8 @@ int main() {
|
||||
cout << endl;
|
||||
|
||||
if (isParsed) {
|
||||
// Calculator calculator;
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -43,39 +43,16 @@
|
||||
"tbase_label": "relative time"
|
||||
}
|
||||
],
|
||||
"TimeRange" : [
|
||||
{
|
||||
"time_range_id": 1,
|
||||
"time_range_from": "00:00:00",
|
||||
"time_range_to": "00:01:00",
|
||||
"time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
|
||||
}
|
||||
],
|
||||
"TimeStepConfig" : [
|
||||
{
|
||||
"tsconfig_id" : 1,
|
||||
"tsconfig_label" : "static",
|
||||
"tsconfig_comment" : "read time steps as given in jsonfiles"
|
||||
},
|
||||
{
|
||||
"tsconfig_id" : 2,
|
||||
"tsconfig_label" : "dynamic",
|
||||
"tsconfig_comment" : "determine timesteps at runtime"
|
||||
}
|
||||
],
|
||||
"Customer": [
|
||||
{
|
||||
"cust_id": 1,
|
||||
"cust_type": 1000,
|
||||
"cust_label": "Adult"
|
||||
},
|
||||
{
|
||||
"cust_id": 2,
|
||||
"cust_type": 1001,
|
||||
"cust_label": "Child"
|
||||
},
|
||||
{
|
||||
"cust_id": 3,
|
||||
"cust_type": 1002,
|
||||
"cust_label": "Teen"
|
||||
}
|
||||
@ -85,72 +62,64 @@
|
||||
"pop_id": 1049,
|
||||
"pop_label": "Zone 1",
|
||||
"pop_payment_method_id": 4,
|
||||
"pop_day_end_time": "08:00:00",
|
||||
"pop_day_night_end_time": "20:00:00",
|
||||
"pop_day_end_time": "00:00:00",
|
||||
"pop_day_night_end_time": "00:00:00",
|
||||
"pop_price_night": 0,
|
||||
"pop_min_time": 1,
|
||||
"pop_max_time": 720,
|
||||
"pop_min_price": 400,
|
||||
"pop_max_time": 2,
|
||||
"pop_min_price": 900,
|
||||
"pop_carry_over": 0,
|
||||
"pop_daily_card_price": 0,
|
||||
"pop_business_hours": 128
|
||||
},
|
||||
{
|
||||
"pop_id": 1050,
|
||||
"pop_label": "Zone 1",
|
||||
"pop_payment_method_id": 4,
|
||||
"pop_day_end_time": "08:00:00",
|
||||
"pop_day_night_end_time": "20:00:00",
|
||||
"pop_price_night": 0,
|
||||
"pop_min_time": 1,
|
||||
"pop_max_time": 720,
|
||||
"pop_min_price": 800,
|
||||
"pop_carry_over": 0,
|
||||
"pop_daily_card_price": 0,
|
||||
"pop_business_hours": 128
|
||||
"pop_business_hours": 2
|
||||
}
|
||||
],
|
||||
"PaymentRate": [
|
||||
{
|
||||
"pra_payment_option_id": 1049,
|
||||
"pra_payment_unit_id": 1,
|
||||
"pra_price": 400
|
||||
},
|
||||
{
|
||||
"pra_payment_option_id": 1050,
|
||||
"pra_payment_unit_id": 2,
|
||||
"pra_price": 800
|
||||
"pop_comment":"Unused"
|
||||
}
|
||||
],
|
||||
"DailyTicket": [
|
||||
{
|
||||
"daily_ticket_payment_option_id": 1049,
|
||||
"daily_ticket_id": 1,
|
||||
"daily_ticket_price_id": 1,
|
||||
"daily_ticket_tb_id": 1,
|
||||
"daily_ticket_clearance_customer_ids": [3],
|
||||
"daily_ticket_from_min": "08:00:00",
|
||||
"daily_ticket_to_max": "20:00:00",
|
||||
"daily_ticket_from_offset_min": 0,
|
||||
"daily_ticket_to_offset_max": 0
|
||||
"daily_ticket_unit_id": 1,
|
||||
"daily_ticket_price": 400,
|
||||
|
||||
"daily_ticket_tbase_type": 0,
|
||||
"daily_ticket_tbase_type_comment": "absolute or relative to offset",
|
||||
|
||||
"daily_ticket_clearance_customer_type": 1002,
|
||||
"daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
|
||||
|
||||
"daily_ticket_weekday_range" : 1,
|
||||
"daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
|
||||
"daily_ticket_special_day_range": 0
|
||||
},
|
||||
{
|
||||
"daily_ticket_payment_option_id": 1050,
|
||||
"daily_ticket_id": 2,
|
||||
"daily_ticket_price_id": 2,
|
||||
"daily_ticket_tb_id": 1,
|
||||
"daily_ticket_clearance_customer_ids": [1],
|
||||
"daily_ticket_from_min": "08:00:00",
|
||||
"daily_ticket_to_max": "20:00:00",
|
||||
"daily_ticket_from_offset_min": 0,
|
||||
"daily_ticket_to_offset_max": 0
|
||||
"daily_ticket_payment_option_id": 1049,
|
||||
"daily_ticket_unit_id": 2,
|
||||
"daily_ticket_price": 800,
|
||||
|
||||
"daily_ticket_tbase_type": 0,
|
||||
"daily_ticket_tbase_type_comment": "absolute or relative to offset",
|
||||
|
||||
"daily_ticket_clearance_customer_type": 1000,
|
||||
"daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
|
||||
|
||||
"daily_ticket_weekday_ranges" : 1,
|
||||
"daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
|
||||
"daily_ticket_special_day_ranges": 0
|
||||
}
|
||||
],
|
||||
"Duration": [
|
||||
{
|
||||
"pun_id": 1,
|
||||
"pun_label": "Tagesticket",
|
||||
"pun_duration": 720
|
||||
"pun_comment":"Unused"
|
||||
}
|
||||
],
|
||||
"TimeRange" : [
|
||||
{
|
||||
"time_range_id": 1,
|
||||
"time_range_from": "08:00:00",
|
||||
"time_range_to": "20:00:00"
|
||||
}
|
||||
],
|
||||
"WeekDaysWorktime": [
|
||||
@ -199,7 +168,7 @@
|
||||
{
|
||||
"pwd_id": 627,
|
||||
"pwd_period_week_day_id": 36,
|
||||
"pwd_period_day_in_week_id": 7,
|
||||
"pwd_period_day_in_week_id": 1,
|
||||
"pwd_time_from": "08:00:00",
|
||||
"pwd_time_to": "20:00:00"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user