Compare commits
30 Commits
2.3.99-24
...
praesentat
Author | SHA1 | Date | |
---|---|---|---|
ed6d355517 | |||
f1f033d1cd | |||
f547f563bf | |||
141d3281b7 | |||
f2156e4650
|
|||
338a1a4ebc
|
|||
b4818a3918 | |||
35294e99f0 | |||
edfa5dc1b1 | |||
d95741baae | |||
e172e814e7 | |||
37aa10fc85 | |||
4b9edb0f47 | |||
e70e9a8586 | |||
aec290fe26 | |||
78cae24389 | |||
de0be1d19b | |||
54921f0e85 | |||
077c2334ca | |||
d605af5c5a | |||
c5900f9f2b | |||
9b137c2873 | |||
dd249a87d5 | |||
575885c19e | |||
d82a732a8d | |||
99dbd7c194 | |||
ae985d25ce
|
|||
6a215d4cf9
|
|||
a3f4a742ce
|
|||
e6d8c04076 |
@@ -277,6 +277,12 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
|
||||
void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
|
||||
int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
|
||||
|
||||
|
||||
int CALCULATE_LIBRARY_API isOutOfService(Configuration const *cfg,
|
||||
QDateTime const &dt);
|
||||
|
||||
int CALCULATE_LIBRARY_API isOutOfService(QDateTime const &dt);
|
||||
|
||||
int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
|
||||
int UpDown, PermitType const &permitType);
|
||||
|
||||
|
@@ -34,6 +34,8 @@
|
||||
|
||||
#include <QVector>
|
||||
#include <optional>
|
||||
#include <QList>
|
||||
#include <QPair>
|
||||
|
||||
using namespace std;
|
||||
using namespace rapidjson;
|
||||
@@ -83,6 +85,11 @@ public:
|
||||
TariffOutOfServiceType TariffOutOfServices;
|
||||
ATBTariffPrepaidType TariffPrepaids;
|
||||
ATBTariffCarryOverType TariffCarryOvers;
|
||||
QList<QPair<QString, QString>> TariffIncludes;
|
||||
|
||||
QTime ValidFrom;
|
||||
int ValidForWeekDay{};
|
||||
QStringList tariffFileName{};
|
||||
|
||||
/// <summary>
|
||||
/// Parse JSON string
|
||||
@@ -123,6 +130,9 @@ public:
|
||||
std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
|
||||
std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
|
||||
|
||||
QList<QPair<QString, QString>> const &getTariffIncludes() const { return TariffIncludes; }
|
||||
QList<QPair<QString, QString>> &getTariffIncludes() { return TariffIncludes; }
|
||||
|
||||
std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
|
||||
int getPaymentOptionIndex(PERMIT_TYPE permitType);
|
||||
int getPaymentOptionIndex(PERMIT_TYPE permitType) const;
|
||||
|
@@ -22,7 +22,8 @@ enum MemberType
|
||||
ProductType = 0x0F,
|
||||
InterpolationType = 0x10,
|
||||
PrepaidType = 0x11,
|
||||
CarryOverType = 0x12
|
||||
CarryOverType = 0x12,
|
||||
IncludesType = 0x13
|
||||
};
|
||||
|
||||
#endif // MEMBER_TYPE_H_INCLUDED
|
||||
|
@@ -37,7 +37,7 @@ struct ATBTariffCarryOver {
|
||||
if (coif == "always") {
|
||||
m_carryOverIf = ApplyCarryOver::ALWAYS;
|
||||
} else {
|
||||
qCritical() << "ERROR unknown carry over application" << coif;
|
||||
qCritical() << __func__ << ":" << __LINE__ << "ERROR unknown carry over application" << coif;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,13 +65,22 @@ struct ATBTariffCarryOver {
|
||||
int minutes = 0;
|
||||
QString end = m_range.m_end.toString(Qt::ISODate);
|
||||
if (end == "24:00:00") {
|
||||
QDateTime t = dt.addDays(1);
|
||||
t.setTime(QTime(0,0,0));
|
||||
minutes = dt.secsTo(t) / 60;
|
||||
// note: this did not work
|
||||
// QDateTime t(dt.addDays(1));
|
||||
// t.setTime(QTime(0,0,0));
|
||||
// dt: 2024-10-27T00:00:00 EEST, but t: 2024-10-28T00:00:00 EET (!)
|
||||
// so the difference is 1500 instead of 1440
|
||||
// reason: change from summer to winter time
|
||||
|
||||
// compute minutes directly
|
||||
if (dt.time().isValid()) {
|
||||
minutes = 1440 - (dt.time().hour() * 60 + dt.time().minute());
|
||||
}
|
||||
} else {
|
||||
QDateTime t(dt);
|
||||
t.setTime(QTime::fromString(end, Qt::ISODate));
|
||||
minutes = dt.secsTo(t) / 60;
|
||||
QTime t(QTime::fromString(end, Qt::ISODate));
|
||||
if (t.isValid() && dt.time().isValid()) {
|
||||
minutes = (t.hour() * 60 + t.minute()) - (dt.time().hour() * 60 + dt.time().minute());
|
||||
}
|
||||
}
|
||||
|
||||
if (minutes < 0 || minutes > m_range.m_duration) {
|
||||
|
@@ -19,7 +19,12 @@ enum class PERMIT_TYPE : quint8 {
|
||||
SHORT_TERM_PARKING_CAMPER=12,
|
||||
DAY_TICKET_PKW=13,
|
||||
DAY_TICKET_BUS=14,
|
||||
DAY_TICKET_CAMPER=15
|
||||
DAY_TICKET_CAMPER=15,
|
||||
FREE_TICKET=16,
|
||||
|
||||
TEST_PRODUCT_1=17,
|
||||
TEST_PRODUCT_2=18,
|
||||
PRODUCT_MAX
|
||||
};
|
||||
|
||||
struct PermitType {
|
||||
@@ -73,6 +78,15 @@ struct PermitType {
|
||||
case 15:
|
||||
m_permitType = PERMIT_TYPE::DAY_TICKET_CAMPER;
|
||||
break;
|
||||
case 16:
|
||||
m_permitType = PERMIT_TYPE::FREE_TICKET;
|
||||
break;
|
||||
case 17:
|
||||
m_permitType = PERMIT_TYPE::TEST_PRODUCT_1;
|
||||
break;
|
||||
case 18:
|
||||
m_permitType = PERMIT_TYPE::TEST_PRODUCT_2;
|
||||
break;
|
||||
default:
|
||||
m_permitType = PERMIT_TYPE::INVALID;
|
||||
}
|
||||
@@ -116,6 +130,12 @@ struct PermitType {
|
||||
return 14;
|
||||
case PERMIT_TYPE::DAY_TICKET_CAMPER:
|
||||
return 15;
|
||||
case PERMIT_TYPE::FREE_TICKET:
|
||||
return 16;
|
||||
case PERMIT_TYPE::TEST_PRODUCT_1:
|
||||
return 17;
|
||||
case PERMIT_TYPE::TEST_PRODUCT_2:
|
||||
return 18;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -132,9 +152,6 @@ struct PermitType {
|
||||
if (permitTypeStr == "DAY_TICKET_CHILD") {
|
||||
return PERMIT_TYPE::DAY_TICKET_CHILD;
|
||||
} else
|
||||
if (permitTypeStr == "DAY_TICKET_ADULT") {
|
||||
return PERMIT_TYPE::DAY_TICKET_ADULT;
|
||||
} else
|
||||
if (permitTypeStr == "DAY_TICKET_TEEN") {
|
||||
return PERMIT_TYPE::DAY_TICKET_TEEN;
|
||||
} else
|
||||
@@ -170,6 +187,15 @@ struct PermitType {
|
||||
} else
|
||||
if (permitTypeStr == "DAY_TICKET_CAMPER") {
|
||||
return PERMIT_TYPE::DAY_TICKET_CAMPER;
|
||||
} else
|
||||
if (permitTypeStr == "FREE_TICKET") {
|
||||
return PERMIT_TYPE::FREE_TICKET;
|
||||
} else
|
||||
if (permitTypeStr == "TEST_PRODUCT_1") {
|
||||
return PERMIT_TYPE::TEST_PRODUCT_1;
|
||||
} else
|
||||
if (permitTypeStr == "TEST_PRODUCT_2") {
|
||||
return PERMIT_TYPE::TEST_PRODUCT_2;
|
||||
}
|
||||
|
||||
return PERMIT_TYPE::INVALID;
|
||||
@@ -207,6 +233,12 @@ struct PermitType {
|
||||
return QString("DAY_TICKET_BUS");
|
||||
case PERMIT_TYPE::DAY_TICKET_CAMPER:
|
||||
return QString("DAY_TICKET_CAMPER");
|
||||
case PERMIT_TYPE::FREE_TICKET:
|
||||
return QString("FREE_TICKET");
|
||||
case PERMIT_TYPE::TEST_PRODUCT_1:
|
||||
return QString("TEST_PRODUCT_1");
|
||||
case PERMIT_TYPE::TEST_PRODUCT_2:
|
||||
return QString("TEST_PRODUCT_2");
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -245,6 +277,12 @@ struct PermitType {
|
||||
return QString("DAY_TICKET_BUS");
|
||||
case PERMIT_TYPE::DAY_TICKET_CAMPER:
|
||||
return QString("DAY_TICKET_CAMPER");
|
||||
case PERMIT_TYPE::FREE_TICKET:
|
||||
return QString("FREE_TICKET");
|
||||
case PERMIT_TYPE::TEST_PRODUCT_1:
|
||||
return QString("TEST_PRODUCT_1");
|
||||
case PERMIT_TYPE::TEST_PRODUCT_2:
|
||||
return QString("TEST_PRODUCT_2");
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@@ -38,7 +38,7 @@ struct ATBTariffPrepaid {
|
||||
if (ppif == "always") {
|
||||
m_prepaidIf = ApplyPrepaid::ALWAYS;
|
||||
} else {
|
||||
qCritical() << "ERROR unknown carry over application" << ppif;
|
||||
qCritical() << __func__ << ":" << __LINE__ << "ERROR unknown carry over application" << ppif;
|
||||
}
|
||||
}
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -379,7 +379,8 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
|
||||
|
||||
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
|
||||
int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
|
||||
int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
|
||||
int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price =
|
||||
cfg->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
|
||||
int const pop_max_time = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
|
||||
int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
|
||||
int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
|
||||
@@ -452,13 +453,50 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
|
||||
netto_parking_time_in_minutes = 0;
|
||||
brutto_parking_time_in_minutes = 0;
|
||||
free_parking_time_in_minutes = 0;
|
||||
int nettoParktimeForCost = 0;
|
||||
|
||||
int const nettoParktimeForCost = priceNettoParktime[int(cost)];
|
||||
qCritical() << __func__ << ":" << __LINE__ << QString("cost=%1 nettoParkTimeForCost=%2").
|
||||
arg(cost).arg(nettoParktimeForCost);
|
||||
if (priceNettoParktime.contains(int(cost))) {
|
||||
nettoParktimeForCost = priceNettoParktime[int(cost)];
|
||||
qCritical() << __func__ << ":" << __LINE__ << QString("cost=%1 nettoParkTimeForCost=%2").
|
||||
arg(cost).arg(nettoParktimeForCost);
|
||||
} else {
|
||||
|
||||
// cannot find netto-parking time for cost (=price)
|
||||
// this happens for direct coin input and should not happen otherwise
|
||||
// take the value for the nearest value of cost and mark result as overpaid
|
||||
|
||||
QList <int> keys = priceNettoParktime.keys(); // keys (=prices) are sorted in ascending order
|
||||
QSet<int> s; // make keys unique
|
||||
for (int k = 0; k < keys.size(); ++k) {
|
||||
if (keys[k] < cost) {
|
||||
s << keys[k];
|
||||
}
|
||||
}
|
||||
keys = s.values();
|
||||
// sort in descending order
|
||||
std::sort(std::begin(keys), std::end(keys), std::greater<>());
|
||||
// qCritical() << __func__ << ":" << __LINE__ << "keys=" << keys;
|
||||
if (!keys.isEmpty()) {
|
||||
int const maxCost = keys[0];
|
||||
auto const p = priceNettoParktime.equal_range(maxCost);
|
||||
for (auto it = p.first; it != p.second; ++it) {
|
||||
nettoParktimeForCost = std::max(nettoParktimeForCost, it.value());
|
||||
}
|
||||
ATBPaymentOption &po = cfg->getPaymentOptions(paymentOptionIndex);
|
||||
po.pop_max_price = maxCost;
|
||||
cfg->getPaymentOptions(paymentOptionIndex).pop_max_price = maxCost;
|
||||
if (pop_allow_overpay) {
|
||||
overPaid = true;
|
||||
}
|
||||
qCritical() << __func__ << ":" << __LINE__ << QString("cost=%1 -> maxCost=%2 nettoParkTimeForCost=%3").
|
||||
arg(cost).arg(maxCost).arg(nettoParktimeForCost);
|
||||
} else {
|
||||
qCritical() << __func__ << ":" << __LINE__ << "ERROR empty keys -> check tariff file";
|
||||
}
|
||||
}
|
||||
|
||||
int cnt = 0;
|
||||
while (++cnt < 10 && netto_parking_time_in_minutes < nettoParktimeForCost) {
|
||||
while (++cnt < 20 && netto_parking_time_in_minutes < nettoParktimeForCost) {
|
||||
// qCritical() << __func__ << ":" << __LINE__ << "cnt [" << cnt;
|
||||
|
||||
brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
|
||||
@@ -711,6 +749,10 @@ Calculator::ComputeCostFromDuration(Configuration *cfg, QDateTime const &startDa
|
||||
CalcState returnState;
|
||||
|
||||
QList<int> keys = nettoParktimePrice.keys();
|
||||
|
||||
qCritical() << __func__ << ":" << __LINE__ << "Times Keys" << keys;
|
||||
qCritical() << __func__ << ":" << __LINE__ << "Prices Keys" << priceNettoParktime.keys();
|
||||
|
||||
int index = keys.indexOf(nettoParkingTime);
|
||||
if (index != -1) {
|
||||
int c = nettoParktimePrice[keys.at(index)];
|
||||
@@ -912,7 +954,8 @@ Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
}
|
||||
|
||||
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
|
||||
int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
|
||||
int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price
|
||||
= cfg->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
|
||||
//int const pop_max_time = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
|
||||
int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
|
||||
int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
|
||||
@@ -3584,7 +3627,9 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
|
||||
}
|
||||
|
||||
if (timeStep == pun_duration) {
|
||||
// allow some tolerance when searching for [timeStep == pun_duration]:
|
||||
// this might happen when crossing minute boundaries
|
||||
if (std::abs(timeStep - pun_duration) < 4) {
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
|
||||
return price;
|
||||
}
|
||||
@@ -3655,6 +3700,9 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
|
||||
if (dailyTickets) {
|
||||
QVector<ATBDailyTicket> const tickets = dailyTickets.value();
|
||||
switch (permitType) {
|
||||
case PERMIT_TYPE::FREE_TICKET: {
|
||||
// TODO
|
||||
} break;
|
||||
case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
|
||||
// TODO
|
||||
} break;
|
||||
@@ -3742,6 +3790,10 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::SHORT_TERM_PARKING: {
|
||||
}
|
||||
case PERMIT_TYPE::TEST_PRODUCT_1: {
|
||||
}
|
||||
case PERMIT_TYPE::TEST_PRODUCT_2: {
|
||||
}
|
||||
// [[fallthrough]];
|
||||
case PERMIT_TYPE::DAY_TICKET: {
|
||||
} break;
|
||||
|
@@ -17,6 +17,8 @@
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
#include <QRegularExpression>
|
||||
#include <QPair>
|
||||
#include <QList>
|
||||
|
||||
/// <inheritdoc/>
|
||||
MemberType Configuration::IdentifyJsonMember(const char* member_name)
|
||||
@@ -46,6 +48,7 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
|
||||
if (strcmp(member_name, "Interpolation") == 0) return MemberType::InterpolationType;
|
||||
if (strcmp(member_name, "Prepaid") == 0) return MemberType::PrepaidType;
|
||||
if (strcmp(member_name, "CarryOver") == 0) return MemberType::CarryOverType;
|
||||
if (strcmp(member_name, "Includes") == 0) return MemberType::IncludesType;
|
||||
else return MemberType::UnknownType;
|
||||
}
|
||||
|
||||
@@ -70,7 +73,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
|
||||
// start with new implementation of tariff-calculator
|
||||
// see for instance: bad neuenahr (249), Zone5
|
||||
|
||||
// qCritical() << __func__ << ":" << __LINE__ << innerObjName;
|
||||
qCritical() << __func__ << ":" << __LINE__ << innerObjName;
|
||||
|
||||
if (k->value.IsObject()) {
|
||||
auto obj = k->value.GetObject();
|
||||
@@ -171,8 +174,9 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
|
||||
if (!d.isNull() && d.isValid()) {
|
||||
TariffPrepaid.m_date = d;
|
||||
}
|
||||
TariffPrepaid.setPrepaidIf(prepaidIf);
|
||||
|
||||
if (!prepaidIf.isNull() && !prepaidIf.trimmed().isEmpty()) {
|
||||
TariffPrepaid.setPrepaidIf(prepaidIf);
|
||||
}
|
||||
qCritical() << TariffPrepaid;
|
||||
|
||||
cfg.TariffPrepaids.insert(std::pair<int, ATBTariffPrepaid>(weekDay, TariffPrepaid));
|
||||
@@ -258,7 +262,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
|
||||
if (!d.isNull() && d.isValid()) {
|
||||
TariffCarryOver.m_date = d;
|
||||
}
|
||||
if (!carryOverIf.isEmpty()) {
|
||||
if (!carryOverIf.isNull() && !carryOverIf.trimmed().isEmpty()) {
|
||||
TariffCarryOver.setCarryOverIf(carryOverIf);
|
||||
}
|
||||
|
||||
@@ -461,6 +465,14 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
|
||||
|
||||
}
|
||||
}
|
||||
ATBTariffSettings ts(max_price, min_price, max_time, min_time);
|
||||
ATBTariffCarryOverSettings cs(duration, start, end, parking_time_limit, about_to_exceed_limit,
|
||||
parkTimeLimitChecker);
|
||||
if (!d.isNull() && d.isValid()) { // special day, given in date-format
|
||||
WeekDay = ATBWeekDay(weekDay, weekDayName, ATBWeekDay::HOLIDAY, QDate(), ts, cs);
|
||||
} else {
|
||||
WeekDay = ATBWeekDay(weekDay, weekDayName, ATBWeekDay::USUAL_WEEKDAY, QDate(), ts, cs);
|
||||
}
|
||||
}
|
||||
} else
|
||||
if (innerObjName == QString("week_day_default")) {
|
||||
@@ -810,6 +822,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
ATBInterpolation TariffInterpolation;
|
||||
ATBPrepaid TariffPrepaidOption;
|
||||
ATBCarryOver TariffCarryOver;
|
||||
QList<QPair<QString, QString>> TariffIncludes;
|
||||
|
||||
MemberType mb_type = MemberType::UnknownType;
|
||||
this->currentPaymentOptions.clear();
|
||||
@@ -875,32 +888,32 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
break;
|
||||
case MemberType::WeekDaysType: {
|
||||
ATBWeekDay WeekDay;
|
||||
if (QString(mb_name) == "Monday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Monday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Monday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Monday, QString(mb_name).trimmed());
|
||||
} else
|
||||
if (QString(mb_name) == "Tuesday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Tuesday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Tuesday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Tuesday, QString(mb_name).trimmed());
|
||||
} else
|
||||
if (QString(mb_name) == "Wednesday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Wednesday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Wednesday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Wednesday, QString(mb_name).trimmed());
|
||||
} else
|
||||
if (QString(mb_name) == "Thursday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Thursday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Thursday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Thursday, QString(mb_name).trimmed());
|
||||
} else
|
||||
if (QString(mb_name) == "Friday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Friday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Friday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Friday, QString(mb_name).trimmed());
|
||||
} else
|
||||
if (QString(mb_name) == "Saturday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Saturday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Saturday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Saturday, QString(mb_name).trimmed());
|
||||
} else
|
||||
if (QString(mb_name) == "Sunday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Sunday, mb_name);
|
||||
if (QString(mb_name).trimmed() == "Sunday") {
|
||||
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Sunday, QString(mb_name).trimmed());
|
||||
} else {
|
||||
qCritical() << "ERROR: unknown week day" << mb_name;
|
||||
}
|
||||
|
||||
cfg->WeekDays.insert(pair<Qt::DayOfWeek, ATBWeekDay>(WeekDay.m_id, WeekDay));
|
||||
// qCritical() << WeekDay;
|
||||
qCritical() << __func__ << ":" << __LINE__ << cfg << "CCCC insert" << (int)WeekDay.m_id << WeekDay.m_name;
|
||||
|
||||
} break;
|
||||
case MemberType::CarryOverType: {
|
||||
@@ -1341,6 +1354,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
|
||||
else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
|
||||
break;
|
||||
case MemberType::IncludesType:
|
||||
TariffIncludes << QPair<QString, QString>(QString(inner_obj_name), k->value.GetString());
|
||||
break;
|
||||
case MemberType::PaymentMethodType:
|
||||
if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
|
||||
else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
|
||||
@@ -1630,6 +1646,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
cfg->TariffCarryOverOptions.insert(pair<int, ATBCarryOver>(TariffCarryOver.id, TariffCarryOver));
|
||||
// qCritical() << TariffCarryOver;
|
||||
break;
|
||||
case MemberType::IncludesType:
|
||||
cfg->TariffIncludes = TariffIncludes;
|
||||
// qCritical() << "TariffIncludes" << cfg->TariffIncludes;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@@ -211,21 +211,73 @@ static bool test_neuhauser_kirchdorf(int step, double cost) {
|
||||
return 0;
|
||||
*/
|
||||
|
||||
#include <QProcess>
|
||||
#include <QCoreApplication>
|
||||
QString getCalculatorLibVersion() {
|
||||
static QString v;
|
||||
if (v.isEmpty()) {
|
||||
QProcess shell;
|
||||
QString command = QString("cat /proc/%1/maps | awk '{print $6;}' | grep 'libmobilisis_calc' | uniq").arg(QCoreApplication::applicationPid());
|
||||
|
||||
shell.start("/bin/bash", {"-c", command});
|
||||
if ( shell.waitForFinished( 5000 )) {
|
||||
v = shell.readAllStandardOutput();
|
||||
// /usr/lib/libmobilisis_calc.so.2.3.99-18
|
||||
if (!v.isEmpty()) {
|
||||
QStringList vlst = v.trimmed().split("/", QString::SkipEmptyParts);
|
||||
if (vlst.size() > 0) {
|
||||
vlst = vlst.last().split(".", QString::SkipEmptyParts);
|
||||
if (vlst.size() > 4) {
|
||||
v = QString("%1.%2.%3").arg(vlst[2]).arg(vlst[3]).arg(vlst[4]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
bool isProductSupportedInCalculatorLib(QString const &product) {
|
||||
bool supported{false};
|
||||
|
||||
QProcess shell;
|
||||
QString command = QString("cat /proc/%1/maps | awk '{print $6;}' | grep 'libmobilisis_calc' | uniq | xargs strings | grep %2").arg(QCoreApplication::applicationPid()).arg(product);
|
||||
|
||||
shell.start("/bin/bash", {"-c", command});
|
||||
if ( shell.waitForFinished( 5000 )) {
|
||||
QString s = shell.readAllStandardOutput().trimmed();
|
||||
// /usr/lib/libmobilisis_calc.so.2.3.99-18
|
||||
if (!s.isEmpty() && (s == product)) {
|
||||
qCritical() << "product" << s << "supported";
|
||||
supported = true;
|
||||
} else {
|
||||
qCritical() << "product" << product << "not supported";
|
||||
}
|
||||
}
|
||||
|
||||
return supported;
|
||||
}
|
||||
|
||||
int main() {
|
||||
|
||||
|
||||
qCritical() << getCalculatorLibVersion();
|
||||
isProductSupportedInCalculatorLib("FREE_TICKET");
|
||||
return 0;
|
||||
//487 {
|
||||
// 488 "pra_payment_option_id": 1049,
|
||||
// 489 "pra_payment_unit_id": 84,
|
||||
// 490 "pra_price":"840"
|
||||
//>>491 }
|
||||
|
||||
//for (int i = 1; i < 85; ++i) {
|
||||
//printf("{\n \"\pra_payment_option_id\": 1049,\n \"\pra_payment_unit_id\": %d,\n \"pra_price\": %d\n},\n",
|
||||
// i, i*10);
|
||||
//for (int i = 1; i < 346; ++i) {
|
||||
//printf("{\n \"pun_id\": %i,\n \"pun_duration\": %d\n},\n",
|
||||
// i, 60 + i*4);
|
||||
//}
|
||||
//return 0;
|
||||
for (int i = 1; i < 361; ++i) {
|
||||
printf("{\n \"pra_payment_option_id\": 1049,\n \"pra_payment_unit_id\": %i,\n \"pra_price\":%i\n},\n",
|
||||
i, i*10);
|
||||
}
|
||||
return 0;
|
||||
#if 0
|
||||
MessageHelper msgHelp;
|
||||
// msgHelp.createLoginMessageChunksToSend(0x02);
|
||||
|
@@ -1,3 +1,5 @@
|
||||
QT += core
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = main
|
||||
|
||||
|
Reference in New Issue
Block a user