save experimental

This commit is contained in:
2024-07-21 20:58:12 +02:00
parent 977356040c
commit 3503306637
12 changed files with 849 additions and 477 deletions

View File

@@ -7,6 +7,7 @@
#include "tariff_business_hours.h"
#include "tariff_global_defines.h"
#include "tariff_carryover.h"
#include "tariff_global_defines.h"
#include <QString>
#include <QDebug>
@@ -15,16 +16,16 @@
/// <inheritdoc/>
MemberType Configuration::IdentifyJsonMember(const char* member_name)
{
if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
//if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
//if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
if (strcmp(member_name, "DailyTicket") == 0) return MemberType::DailyTicketType;
if (strcmp(member_name, "TimeBase") == 0) return MemberType::TimeBaseType;
if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
@@ -42,36 +43,36 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
{
try
{
if (cfg == nullptr)
{
printf("TariffConfiguration pointer not set\n");
return false;
}
if (json == NULL)
{
printf("%s", "Input JSON string is NULL\n");
return false;
}
if (cfg == nullptr)
{
printf("TariffConfiguration pointer not set\n");
return false;
}
if (json == NULL)
{
printf("%s", "Input JSON string is NULL\n");
return false;
}
// Parse JSON to document
Document document;
document.Parse(json);
// Parse JSON to document
Document document;
document.Parse(json);
// Return if parse error has been found
ParseErrorCode err = document.GetParseError();
if (err != 0)
{
printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
return false;
}
// Return if parse error has been found
ParseErrorCode err = document.GetParseError();
if (err != 0)
{
printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
return false;
}
// Validate JSON, check if it's a JSON object
qCritical() << "JSON parsing has been successful";
// Validate JSON, check if it's a JSON object
qCritical() << "JSON parsing has been successful";
if (!document.IsObject()) {
printf("%s", "Error: not a (valid) JSON object\n");
return false;
}
qCritical() << "Valid JSON object identified";
qCritical() << "Valid JSON object identified";
// Validate JSON, check configuration members
if (!document.HasMember("Currency")
@@ -80,36 +81,36 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|| !document.HasMember("PaymentRate")
|| !document.HasMember("Duration")
//|| !document.HasMember("WeekDays")
//|| !document.HasMember("SpecialDaysWorktime")
//|| !document.HasMember("SpecialDays")
)
//|| !document.HasMember("SpecialDaysWorktime")
//|| !document.HasMember("SpecialDays")
)
{
printf("%s", "Error: not a valid configuration JSON\n");
return false;
}
qCritical() << "Valid JSON configuration identified";
qCritical() << "Valid JSON configuration identified";
ATBCurrency Currency;
ATBDuration Duration;
ATBPaymentMethod PaymentMethod;
ATBPaymentRate PaymentRate;
ATBSpecialDaysWorktime SpecialDaysWorktime;
ATBSpecialDays SpecialDays;
ATBWeekDays WeekDays;
ATBWeekDaysWorktime WeekDaysWorktime;
ATBPeriodYear YearPeriod;
ATBDailyTicket DailyTicket;
ATBTimeBase TimeBase;
ATBCustomer Customer;
ATBTimeRange TimeRange;
ATBTimeStepConfig TimeStepConfig;
ATBTariffProduct TariffProduct;
ATBInterpolation TariffInterpolation;
ATBPrepaid TariffPrepaidOption;
ATBCarryOver TariffCarryOver;
ATBCurrency Currency;
ATBDuration Duration;
ATBPaymentMethod PaymentMethod;
ATBPaymentRate PaymentRate;
ATBSpecialDaysWorktime SpecialDaysWorktime;
ATBSpecialDays SpecialDays;
ATBWeekDays WeekDays;
ATBWeekDaysWorktime WeekDaysWorktime;
ATBPeriodYear YearPeriod;
ATBDailyTicket DailyTicket;
ATBTimeBase TimeBase;
ATBCustomer Customer;
ATBTimeRange TimeRange;
ATBTimeStepConfig TimeStepConfig;
ATBTariffProduct TariffProduct;
ATBInterpolation TariffInterpolation;
ATBPrepaid TariffPrepaidOption;
ATBCarryOver TariffCarryOver;
MemberType mb_type = MemberType::UnknownType;
this->currentPaymentOptions.clear();
MemberType mb_type = MemberType::UnknownType;
this->currentPaymentOptions.clear();
// Get all JSON object members
// This code should run only once (to load JSON variables into memory)
@@ -142,35 +143,34 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
qCritical() << " -" << mb_name;
// Get array for each JSON object member
auto mb_array = document[mb_name].GetArray();
if (mb_array.Size() <= 0) break;
// Get array for each JSON object member
auto mb_array = document[mb_name].GetArray();
if (mb_array.Size() <= 0) break;
//Iterate over provided array
for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++)
{
// Get all inner objects, don't print name if NULL
auto inner_obj = mb_array[j].GetObject();
if (inner_obj.MemberCount() <= 0) break;
for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++) {
// Get all inner objects, don't print name if NULL
auto inner_obj = mb_array[j].GetObject();
if (inner_obj.MemberCount() <= 0) break;
// Iterate over inner object JSON members
for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
{
// Get inner object JSON member, don't print name if NULL
const char* inner_obj_name = k->name.GetString();
if (inner_obj_name == NULL)
{
printf("Inner object name is NULL\n");
continue;
}
// Iterate over inner object JSON members
for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
{
// Get inner object JSON member, don't print name if NULL
const char* inner_obj_name = k->name.GetString();
if (inner_obj_name == NULL)
{
printf("Inner object name is NULL\n");
continue;
}
// Identify member type
mb_type = IdentifyJsonMember(mb_name);
// Identify member type
mb_type = IdentifyJsonMember(mb_name);
switch (mb_type)
{
case MemberType::UnknownType:
break;
switch (mb_type)
{
case MemberType::UnknownType:
break;
case MemberType::CarryOverType: {
if (QString(inner_obj_name) == QString("carry_over_id")) {
if (k->value.IsInt()) {
@@ -196,6 +196,11 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
TariffCarryOver.carryover[day].day = day;
}
} else
if (member == "carry_over_duration") {
if (w->value.IsInt()) {
TariffCarryOver.carryover[day].duration = w->value.GetInt();
}
} else
if (member == "carry_over_seemless") {
if (w->value.IsBool()) {
bool b = w->value.GetBool();
@@ -330,6 +335,18 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
int const x = k->value.GetInt();
TariffInterpolation.dynamic_until_price = x;
}
} else
if (QString(inner_obj_name) == QString("interpol_seemless")) {
if (k->value.IsBool()) {
bool const x = k->value.GetBool();
TariffInterpolation.seemless = x;
}
}
if (QString(inner_obj_name) == QString("interpol_never")) {
if (k->value.IsBool()) {
bool const x = k->value.GetBool();
TariffInterpolation.never = x;
}
}
} break;
case MemberType::ProductType: {
@@ -543,22 +560,22 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
}
break;
case MemberType::CurrencyType:
if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
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::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();
break;
case MemberType::PaymentRateType:
if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
break;
case MemberType::PaymentOptionType:
if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
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::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();
break;
case MemberType::PaymentRateType:
if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
break;
case MemberType::PaymentOptionType:
if (strcmp(inner_obj_name, "pop_id") == 0) {
this->currentPaymentOptions.append(ATBPaymentOption());
this->currentPaymentOptions.last().reset();
@@ -583,6 +600,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
} else if (strcmp(inner_obj_name, "pop_prepaid_option_id") == 0) {
this->currentPaymentOptions.last().pop_prepaid_option_id = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_truncate_last_interpolation_step") == 0) {
this->currentPaymentOptions.last().pop_truncate_last_interpolation_step = k->value.GetBool();
} else if (strcmp(inner_obj_name, "pop_carry_over_option_id") == 0) {
this->currentPaymentOptions.last().pop_carry_over_option_id = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_carry_over") == 0) {
@@ -665,93 +684,92 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
}
}
break;
case MemberType::DurationType:
if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pun_duration") == 0) Duration.pun_duration = k->value.GetDouble();
case MemberType::DurationType:
if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pun_duration") == 0) Duration.pun_duration = k->value.GetDouble();
else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
else if (strcmp(inner_obj_name, "pun_duration_max") == 0) Duration.pun_duration_max = k->value.GetInt();
else if (strcmp(inner_obj_name, "pun_interpolation_id") == 0) Duration.pun_interpolation_id = k->value.GetInt();
break;
case MemberType::SpecialDaysWorktimeType:
if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
break;
/*case MemberType::WeekDaysType:
if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
break;*/
case MemberType::WeekDaysWorkTimeType:
if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
case MemberType::SpecialDaysWorktimeType:
if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
break;
/*case MemberType::WeekDaysType:
if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
break;*/
case MemberType::WeekDaysWorkTimeType:
if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
else if (strcmp(inner_obj_name, "pwd_time_to") == 0) WeekDaysWorktime.pwd_time_to = k->value.GetString();
break;
case MemberType::SpecialDaysType:
if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
case MemberType::SpecialDaysType:
if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "ped_payment_option_id") == 0) SpecialDays.ped_payment_option_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "ped_year") == 0) SpecialDays.ped_year = k->value.GetInt();
break;
case MemberType::PeriodYearType:
if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
break;
default:
break;
}
break;
case MemberType::PeriodYearType:
if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
break;
default:
break;
}
//#pragma endregion
}
}
// Push to specific list depending on member type
switch (mb_type)
{
case MemberType::UnknownType:
break;
switch (mb_type) {
case MemberType::UnknownType:
break;
case MemberType::PaymentMethodType:
cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
break;
cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
break;
case MemberType::PaymentRateType:
// qCritical() << "PaymentRate" << PaymentRate;
// qCritical() << "PaymentRate" << PaymentRate.pra_price << PaymentRate.pra_payment_option_id;
cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
break;
break;
case MemberType::PaymentOptionType: {
if (!this->currentPaymentOptions.isEmpty()) {
ATBPaymentOption const &PaymentOption = this->currentPaymentOptions.last();
cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
}
} break;
case MemberType::DurationType:
case MemberType::DurationType:
cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
// qCritical() << Duration;
break;
case MemberType::SpecialDaysWorktimeType:
cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
break;
case MemberType::SpecialDaysWorktimeType:
cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
break;
//case MemberType::WeekDaysType:
// cfg->WeekDays.insert(pair<int, ATBWeekDays>(WeekDays.pdiw_index, WeekDays));
// break;
case MemberType::WeekDaysWorkTimeType:
cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
break;
case MemberType::SpecialDaysType:
cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
break;
case MemberType::PeriodYearType:
cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
break;
case MemberType::WeekDaysWorkTimeType:
cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
break;
case MemberType::SpecialDaysType:
cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
break;
case MemberType::PeriodYearType:
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;
@@ -790,18 +808,136 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
qCritical() << TariffCarryOver;
break;
default:
break;
}
}
break;
}
return true;
}
catch (...) {
printf("%s\n", "General exception has occurred while parsing JSON\n");
return false;
}
}
return true;
}
catch (...) {
printf("%s\n", "General exception has occurred while parsing JSON\n");
return false;
}
}
std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const {
int const pop_id = getPaymentOptions(paymentOptionIndex).pop_id;
int const pop_carry_over_option_id = getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
int const pop_truncate_last_interpolation_step = getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
int const weekDay = start.date().dayOfWeek();
//QTime const &carryOverStart = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
//QTime const &carryOverEnd = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
//bool const carry_over_seemless = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].seemless;
//bool const carry_over_never = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].never;
int const carryOverDuration = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
std::optional<QDateTime> value = std::nullopt;
QDateTime interpolationEndTime = start;
int price = 0;
for (auto[itr, rangeEnd] = PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const durationId = itr->second.pra_payment_unit_id;
// int const price = itr->second.pra_price;
auto search = Duration.find(durationId);
if (search != Duration.end()) {
ATBDuration duration = search->second;
if (duration.pun_interpolation_id == -1) {
// should never happen -> misconfigured tariff-file
qCritical() << "(" << __func__ << ":" << __LINE__ << ") ERROR pun_interpolation not set!";
qCritical() << "(" << __func__ << ":" << __LINE__ << ") See for instance customer_505/6";
break;
}
std::optional<ATBInterpolation> ipolCheck = getInterpolationType(duration.pun_interpolation_id);
if (ipolCheck) {
ATBInterpolation interpolation = ipolCheck.value();
switch (duration.pun_interpolation_id) {
case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
break;
case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
break;
case static_cast<int>(ATBInterpolation::STATIC_TIMEPOINT_AND_DURATION):
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
break;
case static_cast<int>(ATBInterpolation::DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
break;
case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
break;
case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE): {
interpolation.dynamic_start = start.time();
interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpol start:" << interpolation.dynamic_start.toString(Qt::ISODate);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << interpolationEndTime.toString(Qt::ISODate);
if (interpolation.seemless) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
} else
if (interpolation.never) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
} else {
QDateTime const &s = interpolationEndTime.addSecs(duration.pun_duration * 60);
int const minutesToStaticEnd = s.time().secsTo(interpolation.static_end) / 60;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << s.toString(Qt::ISODate);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpol static end:" << interpolation.static_end.toString(Qt::ISODate);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") minutes to static end:" << minutesToStaticEnd;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun-id:" << duration.pun_id;
int p = 0;
for (auto[it, rangeEnd] = this->PaymentRate.equal_range(pop_id); it != rangeEnd; ++it) {
if (it->second.pra_payment_unit_id == duration.pun_id) {
if (minutesToStaticEnd >= 0) {
// the end of the interpolation for this day must be before a possible carry over interval
p = it->second.pra_price;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") next price:" << p;
price += p;
interpolationEndTime = s;
} else {
if (pop_truncate_last_interpolation_step == false) {
p = it->second.pra_price;
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") next price:" << p;
price += p;
interpolationEndTime = s;
interpolationEndTime = interpolationEndTime.addSecs(carryOverDuration * 60);
} else {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
}
}
}
}
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") price:" << price;
if (price >= interpolation.dynamic_until_price) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") price:" << price;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol endr:" << interpolationEndTime.toString(Qt::ISODate);
value = value.value_or(interpolationEndTime);
break;
}
}
}
break;
case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
break;
default:;
}
}
}
}
return value;
}
int Configuration::getPaymentOptionIndexIfSpecialDay(QDateTime const &dt) const {
if (isSpecialDay(dt)) {
int const numOptions = getAllPaymentOptions().size();
@@ -1043,23 +1179,27 @@ std::optional<ATBPrepaid> Configuration::getPrepaidType(int key) const {
return value;
}
std::optional<QDateTime> Configuration::adaptStart(QDateTime const &start, int prepaid_option_id) {
std::optional<QDateTime> Configuration::prepaidStart(QDateTime const &start, int prepaid_option_id) {
std::optional<QDateTime> value;
QDateTime s = start;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepaid option id:" << prepaid_option_id;
std::optional<ATBPrepaid> prepaid_option = getPrepaidType(prepaid_option_id);
if (prepaid_option.has_value()) {
ATBPrepaid prepaid = prepaid_option.value();
if (prepaid.anytime == true) {
int const weekdayId = s.date().dayOfWeek();
QTime worktime_from = QTime::fromString(WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str(), Qt::ISODate);
QTime worktime_to = QTime::fromString(WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str(), Qt::ISODate);
if (s.time() < worktime_from) {
s.setTime(worktime_from);
if (prepaid.anytime == false && prepaid.never == false) {
// start: 22:00, end: 08:00
QTime prepaidStart = TariffPrepaidOptions.find(prepaid_option_id)->second.static_start;
QTime prepaidEnd = TariffPrepaidOptions.find(prepaid_option_id)->second.static_end;
if (s.time() >= prepaidStart) {
s = s.addDays(1);
s.setTime(prepaidEnd);
} else
if (worktime_to < s.time()) {
s = start.addDays(1);
s.setTime(worktime_from);
if (s.time() < prepaidEnd) {
s.setTime(prepaidEnd);
}
s.setTime(QTime(s.time().hour(), s.time().minute(), 0));
value = value.value_or(s);