GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

just save for muenchen presentation

Browse Source
This commit is contained in:
Gerhard Hoffmann 2025-05-28 15:17:11 +02:00
parent f2156e4650
commit 141d3281b7
5 changed files with 472 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/include/mobilisis/configuration.h
View File

@ -34,6 +34,8 @@
#include <QVector> #include <QVector>
#include <optional> #include <optional>
#include <QList>
#include <QPair>
using namespace std; using namespace std;
using namespace rapidjson; using namespace rapidjson;
@ -83,7 +85,11 @@ public:
TariffOutOfServiceType TariffOutOfServices; TariffOutOfServiceType TariffOutOfServices;
ATBTariffPrepaidType TariffPrepaids; ATBTariffPrepaidType TariffPrepaids;
ATBTariffCarryOverType TariffCarryOvers; ATBTariffCarryOverType TariffCarryOvers;
QStringList TariffIncludes; QList<QPair<QString, QString>> TariffIncludes;
QTime ValidFrom;
int ValidForWeekDay{};
QString tariffFileName{};
/// <summary> /// <summary>
/// Parse JSON string /// Parse JSON string
@ -124,8 +130,8 @@ public:
std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek); std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes(); std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
QStringList const &getTariffIncludes() const { return TariffIncludes; } QList<QPair<QString, QString>> const &getTariffIncludes() const { return TariffIncludes; }
QStringList &getTariffIncludes() { return TariffIncludes; } QList<QPair<QString, QString>> &getTariffIncludes() { return TariffIncludes; }
std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id); std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
int getPaymentOptionIndex(PERMIT_TYPE permitType); int getPaymentOptionIndex(PERMIT_TYPE permitType);

27
library/include/mobilisis/tariff_permit_type.h
View File

@ -21,6 +21,9 @@ enum class PERMIT_TYPE : quint8 {
DAY_TICKET_BUS=14, DAY_TICKET_BUS=14,
DAY_TICKET_CAMPER=15, DAY_TICKET_CAMPER=15,
FREE_TICKET=16, FREE_TICKET=16,
TEST_PRODUCT_1=17,
TEST_PRODUCT_2=18,
PRODUCT_MAX PRODUCT_MAX
}; };
@ -78,6 +81,12 @@ struct PermitType {
case 16: case 16:
m_permitType = PERMIT_TYPE::FREE_TICKET; m_permitType = PERMIT_TYPE::FREE_TICKET;
break; break;
case 17:
m_permitType = PERMIT_TYPE::TEST_PRODUCT_1;
break;
case 18:
m_permitType = PERMIT_TYPE::TEST_PRODUCT_2;
break;
default: default:
m_permitType = PERMIT_TYPE::INVALID; m_permitType = PERMIT_TYPE::INVALID;
} }
@ -123,6 +132,10 @@ struct PermitType {
return 15; return 15;
case PERMIT_TYPE::FREE_TICKET: case PERMIT_TYPE::FREE_TICKET:
return 16; return 16;
case PERMIT_TYPE::TEST_PRODUCT_1:
return 17;
case PERMIT_TYPE::TEST_PRODUCT_2:
return 18;
default: default:
break; break;
} }
@ -177,6 +190,12 @@ struct PermitType {
} else } else
if (permitTypeStr == "FREE_TICKET") { if (permitTypeStr == "FREE_TICKET") {
return PERMIT_TYPE::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; return PERMIT_TYPE::INVALID;
@ -216,6 +235,10 @@ struct PermitType {
return QString("DAY_TICKET_CAMPER"); return QString("DAY_TICKET_CAMPER");
case PERMIT_TYPE::FREE_TICKET: case PERMIT_TYPE::FREE_TICKET:
return QString("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: default:
break; break;
} }
@ -256,6 +279,10 @@ struct PermitType {
return QString("DAY_TICKET_CAMPER"); return QString("DAY_TICKET_CAMPER");
case PERMIT_TYPE::FREE_TICKET: case PERMIT_TYPE::FREE_TICKET:
return QString("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: default:
break; break;
} }

414
library/src/calculate_price.cpp
View File

@ -33,6 +33,7 @@ QString const CalcState::SUCCESS_MAXPRICE = "SUCCESS_MAXPRICE";
static std::map<PERMIT_TYPE, std::unique_ptr<parking_tariff_t>> tariffs; static std::map<PERMIT_TYPE, std::unique_ptr<parking_tariff_t>> tariffs;
static QDateTime start_ = QDateTime::currentDateTime();
QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) { QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
return Calculator::GetInstance().GetTimeSteps(cfg); return Calculator::GetInstance().GetTimeSteps(cfg);
@ -41,17 +42,80 @@ QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg, int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
PERMIT_TYPE permitType, PERMIT_TYPE permitType,
int paymentOptionIndex) { int paymentOptionIndex) {
qCritical() << __func__ << ":" << __LINE__;
int minTime = 0; int minTime = 0;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
Configuration *c = tariffs[permitType].get(); Configuration *c = tariffs[permitType].get();
if (c && c != cfg) { if (c && c != cfg) {
cfg = c; Configuration *const c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
Configuration *const c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (cfg != c1 && cfg != c2) {
cfg = c;
qCritical() << __func__ << ":" << __LINE__;
}
} }
} }
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
Configuration *c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
if (c1 && c1->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__ << start_.time() << c1->ValidFrom;
if (start_.time() >= c1->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
} else
if (c1 && c1->ValidForWeekDay == start_.date().dayOfWeek()) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__;
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__;
if (start_.time() >= c2->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
cfg = c2;
}
}
}
}
int weekDay = start_.date().dayOfWeek();
qCritical() << __func__ << __LINE__ << cfg << "CCCCCC week" << (int)permitType << weekDay;
for (auto[itr, rangeEnd] = cfg->WeekDays.equal_range((Qt::DayOfWeek)weekDay); itr != rangeEnd; ++itr) {
ATBWeekDay const &wd = itr->second;
minTime = wd.getTariffSettings().m_min_time;
qCritical() << __func__ << __LINE__ << "CCCCCC min_time" << (int)permitType << minTime;
if (minTime < 0) {
return minTime;
}
break;
}
paymentOptionIndex = getPaymentOptionIndex(*cfg); paymentOptionIndex = getPaymentOptionIndex(*cfg);
if (paymentOptionIndex == -1) { if (paymentOptionIndex == -1) {
paymentOptionIndex = cfg->getPaymentOptionIndex(permitType); paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
@ -82,7 +146,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time); minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
} }
qCritical() << "minTime" << minTime; qCritical() << __func__ << ":" << __LINE__ << " minTime" << minTime;
return minTime; return minTime;
} }
@ -90,12 +154,59 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
PERMIT_TYPE permitType, PERMIT_TYPE permitType,
int paymentOptionIndex) { int paymentOptionIndex) {
qCritical() << __func__ << ":" << __LINE__;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
Configuration *c = tariffs[permitType].get(); Configuration *c = tariffs[permitType].get();
if (c && c != cfg) { if (c && c != cfg) {
cfg = c; Configuration *const c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
Configuration *const c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (cfg != c1 && cfg != c2) {
cfg = c;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
Configuration *c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
if (c1 && c1->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__ << start_.time() << c1->ValidFrom;
if (start_.time() >= c1->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
} else
if (c1 && c1->ValidForWeekDay == start_.date().dayOfWeek()) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__;
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__;
if (start_.time() >= c2->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
cfg = c2;
}
}
} }
} }
@ -120,6 +231,8 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
} }
qCritical() << __func__ << ":" << __LINE__ << " maxTime" << maxTime;
return maxTime; return maxTime;
} }
@ -127,6 +240,8 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
PERMIT_TYPE permitType, PERMIT_TYPE permitType,
int paymentOptionIndex, int paymentOptionIndex,
QDateTime const &start) { QDateTime const &start) {
qCritical() << __func__ << ":" << __LINE__;
start_ = start;
int minPrice = -1; int minPrice = -1;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
@ -134,7 +249,53 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
Configuration *c = tariffs[permitType].get(); Configuration *c = tariffs[permitType].get();
if (c && c != cfg) { if (c && c != cfg) {
cfg = c; Configuration *const c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
Configuration *const c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (cfg != c1 && cfg != c2) {
cfg = c;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
Configuration *c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
if (c1 && c1->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__ << start_.time() << c1->ValidFrom;
if (start_.time() >= c1->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
} else
if (c1 && c1->ValidForWeekDay == start_.date().dayOfWeek()) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__;
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__;
if (start_.time() >= c2->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
cfg = c2;
}
}
} }
} }
@ -194,6 +355,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
} }
} }
qCritical() << __func__ << ":" << __LINE__ << " minPrice" << minPrice;
return minPrice; return minPrice;
} }
@ -202,12 +364,18 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
QDateTime const &start, QDateTime const &start,
QDateTime *productStart, QDateTime *productStart,
QDateTime *productEnd) { QDateTime *productEnd) {
start_ = start;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
Configuration *c = tariffs[permitType].get(); Configuration *c = tariffs[permitType].get();
if (c && c != cfg) { if (c && c != cfg) {
cfg = c; Configuration *const c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
Configuration *const c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (cfg != c1 && cfg != c2) {
cfg = c;
qCritical() << __func__ << ":" << __LINE__;
}
} }
} }
@ -372,6 +540,7 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
PERMIT_TYPE permitType, PERMIT_TYPE permitType,
int paymentOptionIndex) { int paymentOptionIndex) {
qCritical() << __func__ << ":" << __LINE__;
int maxPrice = -1; int maxPrice = -1;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
@ -379,7 +548,53 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
Configuration *c = tariffs[permitType].get(); Configuration *c = tariffs[permitType].get();
if (c && c != cfg) { if (c && c != cfg) {
cfg = c; Configuration *const c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
Configuration *const c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (cfg != c1 && cfg != c2) {
cfg = c;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
Configuration *c1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
if (c1 && c1->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__ << start_.time() << c1->ValidFrom;
if (start_.time() >= c1->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
} else
if (c1 && c1->ValidForWeekDay == start_.date().dayOfWeek()) {
qCritical() << __func__ << ":" << __LINE__;
if (c1 && c1 != cfg) {
cfg = c1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__;
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
Configuration *c2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (c2 && c2->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__;
if (start_.time() >= c2->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
if (c2 && c2 != cfg) {
qCritical() << __func__ << ":" << __LINE__;
cfg = c2;
}
}
} }
} }
@ -441,6 +656,7 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
default: ; default: ;
} }
qCritical() << __func__ << ":" << __LINE__ << " maxPrice" << maxPrice;
return maxPrice; return maxPrice;
} }
@ -520,17 +736,32 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
if ((*tariff)->TariffIncludes.size() > 0) { if ((*tariff)->TariffIncludes.size() > 0) {
qCritical() << "init_tariff: TariffIncludes" << (*tariff)->TariffIncludes; qCritical() << "init_tariff: TariffIncludes" << (*tariff)->TariffIncludes;
for (int i = 0 ; i < (*tariff)->TariffIncludes.size(); ++i) { for (int i = 0 ; i < (*tariff)->TariffIncludes.size(); ++i) {
QFile f(QString("/etc/psa_tariff/%1").arg((*tariff)->TariffIncludes.at(i))); QPair<QString, QString> const &p = (*tariff)->TariffIncludes.at(i);
QFile f(QString("/etc/psa_tariff/%1").arg((*tariff)->TariffIncludes.at(i).second));
if (f.exists() && if (f.exists() &&
f.open(QIODevice::ReadOnly | QIODevice::Text)) { f.open(QIODevice::ReadOnly | QIODevice::Text)) {
QString json = f.readAll(); QString json = f.readAll();
std::unique_ptr<parking_tariff_t> t = std::make_unique<parking_tariff_t>(); std::unique_ptr<parking_tariff_t> t = std::make_unique<parking_tariff_t>();
if (! t->ParseJson(t.get(), json.toStdString().c_str())) { if (! t->ParseJson(t.get(), json.toStdString().c_str())) {
qCritical() << " ... error parsing tariff in" << f.fileName(); qCritical() << " ... error parsing tariff in" << f.fileName();
qCritical() << " ... json" << json; qCritical() << " ... json" << json;
} else { } else {
t->tariffFileName = p.second.trimmed();
QTime validFrom(QTime::fromString(p.first, Qt::ISODate));
if (validFrom.isValid()) {
t->ValidFrom = validFrom;
}
QString validForWeekDay(p.first);
qCritical() << " ... valid for weekday" << validForWeekDay;
if (validForWeekDay.contains("Sat")) {
t->ValidForWeekDay = (int)Qt::Saturday;
qCritical() << " ... valid for weekday" << validForWeekDay;
}
PERMIT_TYPE pt = static_cast<PERMIT_TYPE>(t->getPaymentOptions().pop_product_id); PERMIT_TYPE pt = static_cast<PERMIT_TYPE>(t->getPaymentOptions().pop_product_id);
if (tariffs.count(pt) == 0) { if (tariffs.count(pt) == 0) {
const auto [it, success] = tariffs.insert(std::make_pair(pt, std::move(t))); const auto [it, success] = tariffs.insert(std::make_pair(pt, std::move(t)));
@ -556,7 +787,62 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
int UpDown, PermitType const &permitType) int UpDown, PermitType const &permitType)
{ {
if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) {
parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
parking_tariff_t *t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
if (t1 && t1->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__ << start_.time() << t1->ValidFrom;
if (start_.time() >= t1->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
parking_tariff_t *t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (t2 && t2 != tariff) {
qCritical() << __func__ << ":" << __LINE__;
if (t1 && t1 != tariff) {
tariff = t1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
} else
if (t1 && t1->ValidForWeekDay == start_.date().dayOfWeek()) {
qCritical() << __func__ << ":" << __LINE__;
if (t1 && t1 != tariff) {
tariff = t1;
qCritical() << __func__ << ":" << __LINE__;
}
}
}
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__;
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
parking_tariff_t *t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (t2 && t2->ValidFrom.isValid()) {
qCritical() << __func__ << ":" << __LINE__;
if (start_.time() >= t2->ValidFrom) {
qCritical() << __func__ << ":" << __LINE__;
if (t2 && t2 != tariff) {
qCritical() << __func__ << ":" << __LINE__;
tariff = t2;
}
}
}
}
qCritical() << __LINE__ << "compute_next_timestep() start: " << start_.toString(Qt::ISODate);
qCritical() << __LINE__ << "compute_next_timestep() valid from: " << tariff->ValidFrom.toString(Qt::ISODate);
qCritical() << __LINE__ << "compute_next_timestep() currentTimeMinutes: " << currentTimeMinutes; qCritical() << __LINE__ << "compute_next_timestep() currentTimeMinutes: " << currentTimeMinutes;
qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown; qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
@ -587,6 +873,7 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
qCritical() << __LINE__ << "compute_next_timestep() payment option index: " << paymentOptionIndex; qCritical() << __LINE__ << "compute_next_timestep() payment option index: " << paymentOptionIndex;
qCritical() << __LINE__ << "compute_next_timestep() plus steps: " << pop_plus_steps; qCritical() << __LINE__ << "compute_next_timestep() plus steps: " << pop_plus_steps;
qCritical() << __LINE__ << "compute_next_timestep() minus steps: " << pop_minus_steps; qCritical() << __LINE__ << "compute_next_timestep() minus steps: " << pop_minus_steps;
qCritical() << __LINE__ << "compute_next_timestep() valid from: " << tariff->ValidFrom;
Configuration const *cfg = tariff; Configuration const *cfg = tariff;
@ -703,6 +990,18 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
qCritical() << __LINE__ << "compute_next_timestep() next step index:" << nextStepIndex; qCritical() << __LINE__ << "compute_next_timestep() next step index:" << nextStepIndex;
if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) { if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex]; qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
// L264
if (tariff->tariffFileName.contains("tariff02")) {
QDateTime dt = start_.addSecs( stepList[nextStepIndex] * 60);
qCritical() << __LINE__ << "compute_next_timestep() dt:" << dt.toString(Qt::ISODate);
if (dt.time() > QTime::fromString("23:11:59", Qt::ISODate)) {
qCritical() << __LINE__ << "compute_next_timestep() dt:" << currentTimeMinutes;
return currentTimeMinutes;
}
}
return stepList[nextStepIndex]; return stepList[nextStepIndex];
} }
} }
@ -771,15 +1070,30 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
start = start.toLocalTime().addSecs(start_parking_time * 60); start = start.toLocalTime().addSecs(start_parking_time * 60);
QDateTime end(start); QDateTime end(start);
start_ = start;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get(); parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) { if (t && t != tariff) {
tariff = t; parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
}
} }
} }
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
} else
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
}
int paymentOptionIndex = getPaymentOptionIndex(*tariff, start); int paymentOptionIndex = getPaymentOptionIndex(*tariff, start);
if (paymentOptionIndex == -1) { if (paymentOptionIndex == -1) {
paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get()); paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
@ -851,6 +1165,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
PermitType permitType, PermitType permitType,
bool prepaid) bool prepaid)
{ {
start_ = start_parking_time_;
CalcState calcState; CalcState calcState;
QDateTime start_parking_time(start_parking_time_); QDateTime start_parking_time(start_parking_time_);
@ -860,10 +1176,46 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get(); parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) { if (t && t != tariff) {
tariff = t; parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
}
} }
} }
qCritical() << __func__ << ":" << __LINE__;
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_1)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_1";
parking_tariff_t *t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
if (t1 && t1->ValidFrom.isValid()) {
if (start_parking_time_.time() >= t1->ValidFrom) {
parking_tariff_t *t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (t2 && t2 != tariff) {
if (t1 && t1 != tariff) {
tariff = t1;
}
}
}
} else
if (t1 && t1->ValidForWeekDay == start_.date().dayOfWeek()) {
qCritical() << __func__ << ":" << __LINE__;
if (t1 && t1 != tariff) {
tariff = t1;
qCritical() << __func__ << ":" << __LINE__;
}
}
} else
if (tariffs.count(PermitType(PERMIT_TYPE::TEST_PRODUCT_2)) > 0) {
qCritical() << __func__ << ":" << __LINE__ << "TEST_PRODUCT_2";
parking_tariff_t *t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (t2 && t2 != tariff) {
tariff = t2;
}
}
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time); int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
if (paymentOptionIndex == -1) { if (paymentOptionIndex == -1) {
paymentOptionIndex = tariff->getPaymentOptionIndex(permitType); paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
@ -886,24 +1238,32 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
<< " prepaid: " << prepaid << " prepaid: " << prepaid
<< " permitType: " << permitType.toString(); << " permitType: " << permitType.toString();
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
if (netto_parking_time < 0) { if (netto_parking_time < 0) {
calcState.setDesc(QString("end=%1, start=%2") calcState.setDesc(QString("end=%1, start=%2")
.arg(end_parking_time.toString(Qt::ISODate), .arg(end_parking_time.toString(Qt::ISODate),
start_parking_time.toString(Qt::ISODate))); start_parking_time.toString(Qt::ISODate)));
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME); return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
} }
if (netto_parking_time > maxMin) { if (netto_parking_time > maxMin) {
calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin)); calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME); return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
} }
if (netto_parking_time < minMin) { if (netto_parking_time < minMin) {
calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin)); calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
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) {
return calcState.set(CalcState::State::SUCCESS); qCritical() << __func__ << ":" << __LINE__ << "CCCCCC" << netto_parking_time;
// return calcState.set(CalcState::State::SUCCESS);
} }
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
double cost = -1; double cost = -1;
if (start_parking_time.isValid()) { if (start_parking_time.isValid()) {
if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps || if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps ||
@ -1109,6 +1469,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
} }
} else } else
if (tariff->getPaymentOptions(0).pop_payment_method_id == PaymentMethod::Unified) { if (tariff->getPaymentOptions(0).pop_payment_method_id == PaymentMethod::Unified) {
qCritical() << __func__ << ":" << __LINE__ << "CCCCCC";
std::pair<CalcState, std::optional<int>> p = std::pair<CalcState, std::optional<int>> p =
Calculator::GetInstance().ComputeCostFromDuration(tariff, start_parking_time, end_parking_time, netto_parking_time); Calculator::GetInstance().ComputeCostFromDuration(tariff, start_parking_time, end_parking_time, netto_parking_time);
CalcState const cs = p.first; CalcState const cs = p.first;
@ -1171,7 +1532,11 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get(); parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) { if (t && t != tariff) {
tariff = t; parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
}
} }
} }
@ -1183,6 +1548,9 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
QTime const t(0, 0, 0); QTime const t(0, 0, 0);
QDateTime start(d, t, Qt::UTC); QDateTime start(d, t, Qt::UTC);
start = start.toLocalTime().addSecs(start_parking_time * 60); start = start.toLocalTime().addSecs(start_parking_time * 60);
start_ = start;
if (start.isValid()) { if (start.isValid()) {
QString cs = start.toString(Qt::ISODate); QString cs = start.toString(Qt::ISODate);
@ -1233,12 +1601,18 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
QDateTime &ticketEndTime, QDateTime &ticketEndTime,
PermitType permitType) PermitType permitType)
{ {
start_ = start_parking_time;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get(); parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) { if (t && t != tariff) {
tariff = t; parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
}
} }
} }
@ -1579,12 +1953,18 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
QDateTime &ticketEndTime, QDateTime &ticketEndTime,
PermitType permitType) PermitType permitType)
{ {
start_ = start_parking_time;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get(); parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) { if (t && t != tariff) {
tariff = t; parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
}
} }
} }
@ -1623,12 +2003,18 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
PERMIT_TYPE permitType, PERMIT_TYPE permitType,
struct price_t *price) {// return value struct price_t *price) {// return value
start_ = startDatetime;
// tariffs are only set if there is a Includes-section in the tariff-file, // tariffs are only set if there is a Includes-section in the tariff-file,
// which means the code below will be executed only in such a case. // which means the code below will be executed only in such a case.
if (tariffs.count(permitType) > 0) { if (tariffs.count(permitType) > 0) {
parking_tariff_t *t = tariffs[permitType].get(); parking_tariff_t *t = tariffs[permitType].get();
if (t && t != tariff) { if (t && t != tariff) {
tariff = t; parking_tariff_t *const t1 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_1)].get();
parking_tariff_t *const t2 = tariffs[PermitType(PERMIT_TYPE::TEST_PRODUCT_2)].get();
if (tariff != t1 && tariff != t2) {
tariff = t;
}
} }
} }

8
library/src/calculator_functions.cpp
View File

@ -749,6 +749,10 @@ Calculator::ComputeCostFromDuration(Configuration *cfg, QDateTime const &startDa
CalcState returnState; CalcState returnState;
QList<int> keys = nettoParktimePrice.keys(); QList<int> keys = nettoParktimePrice.keys();
qCritical() << __func__ << ":" << __LINE__ << "Times Keys" << keys;
qCritical() << __func__ << ":" << __LINE__ << "Prices Keys" << priceNettoParktime.keys();
int index = keys.indexOf(nettoParkingTime); int index = keys.indexOf(nettoParkingTime);
if (index != -1) { if (index != -1) {
int c = nettoParktimePrice[keys.at(index)]; int c = nettoParktimePrice[keys.at(index)];
@ -3786,6 +3790,10 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
// [[fallthrough]]; // [[fallthrough]];
case PERMIT_TYPE::SHORT_TERM_PARKING: { case PERMIT_TYPE::SHORT_TERM_PARKING: {
} }
case PERMIT_TYPE::TEST_PRODUCT_1: {
}
case PERMIT_TYPE::TEST_PRODUCT_2: {
}
// [[fallthrough]]; // [[fallthrough]];
case PERMIT_TYPE::DAY_TICKET: { case PERMIT_TYPE::DAY_TICKET: {
} break; } break;

46
library/src/configuration.cpp
View File

@ -17,6 +17,8 @@
#include <QString> #include <QString>
#include <QDebug> #include <QDebug>
#include <QRegularExpression> #include <QRegularExpression>
#include <QPair>
#include <QList>
/// <inheritdoc/> /// <inheritdoc/>
MemberType Configuration::IdentifyJsonMember(const char* member_name) MemberType Configuration::IdentifyJsonMember(const char* member_name)
@ -71,7 +73,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
// start with new implementation of tariff-calculator // start with new implementation of tariff-calculator
// see for instance: bad neuenahr (249), Zone5 // see for instance: bad neuenahr (249), Zone5
// qCritical() << __func__ << ":" << __LINE__ << innerObjName; qCritical() << __func__ << ":" << __LINE__ << innerObjName;
if (k->value.IsObject()) { if (k->value.IsObject()) {
auto obj = k->value.GetObject(); auto obj = k->value.GetObject();
@ -463,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 } else
if (innerObjName == QString("week_day_default")) { if (innerObjName == QString("week_day_default")) {
@ -812,7 +822,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
ATBInterpolation TariffInterpolation; ATBInterpolation TariffInterpolation;
ATBPrepaid TariffPrepaidOption; ATBPrepaid TariffPrepaidOption;
ATBCarryOver TariffCarryOver; ATBCarryOver TariffCarryOver;
QStringList TariffIncludes; QList<QPair<QString, QString>> TariffIncludes;
MemberType mb_type = MemberType::UnknownType; MemberType mb_type = MemberType::UnknownType;
this->currentPaymentOptions.clear(); this->currentPaymentOptions.clear();
@ -878,32 +888,32 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
break; break;
case MemberType::WeekDaysType: { case MemberType::WeekDaysType: {
ATBWeekDay WeekDay; ATBWeekDay WeekDay;
if (QString(mb_name) == "Monday") { if (QString(mb_name).trimmed() == "Monday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Monday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Monday, QString(mb_name).trimmed());
} else } else
if (QString(mb_name) == "Tuesday") { if (QString(mb_name).trimmed() == "Tuesday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Tuesday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Tuesday, QString(mb_name).trimmed());
} else } else
if (QString(mb_name) == "Wednesday") { if (QString(mb_name).trimmed() == "Wednesday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Wednesday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Wednesday, QString(mb_name).trimmed());
} else } else
if (QString(mb_name) == "Thursday") { if (QString(mb_name).trimmed() == "Thursday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Thursday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Thursday, QString(mb_name).trimmed());
} else } else
if (QString(mb_name) == "Friday") { if (QString(mb_name).trimmed() == "Friday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Friday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Friday, QString(mb_name).trimmed());
} else } else
if (QString(mb_name) == "Saturday") { if (QString(mb_name).trimmed() == "Saturday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Saturday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Saturday, QString(mb_name).trimmed());
} else } else
if (QString(mb_name) == "Sunday") { if (QString(mb_name).trimmed() == "Sunday") {
WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Sunday, mb_name); WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Sunday, QString(mb_name).trimmed());
} else { } else {
qCritical() << "ERROR: unknown week day" << mb_name; qCritical() << "ERROR: unknown week day" << mb_name;
} }
cfg->WeekDays.insert(pair<Qt::DayOfWeek, ATBWeekDay>(WeekDay.m_id, WeekDay)); 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; } break;
case MemberType::CarryOverType: { case MemberType::CarryOverType: {
@ -1345,7 +1355,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool(); else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
break; break;
case MemberType::IncludesType: case MemberType::IncludesType:
TariffIncludes << k->value.GetString(); TariffIncludes << QPair<QString, QString>(QString(inner_obj_name), k->value.GetString());
break; break;
case MemberType::PaymentMethodType: case MemberType::PaymentMethodType:
if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt(); if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();