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

save experimental

Browse Source
This commit is contained in:
Gerhard Hoffmann
2024-07-21 20:58:12 +02:00
parent 977356040c
commit 3503306637
12 changed files with 849 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,26 +50,26 @@ public:
ATBProject project;
ATBCurrency Currency;
ATBDuration duration;
ATBDuration duration;
multimap<int, ATBDuration> Duration;
multimap<int, ATBPaymentMethod> PaymentMethod;
multimap<int, ATBPaymentRate> PaymentRate;
SpecialDaysWorktimeType SpecialDaysWorktime;
SpecialDaysType SpecialDays;
SpecialDaysWorktimeType SpecialDaysWorktime;
SpecialDaysType SpecialDays;
multimap<int, ATBWeekDays> WeekDays;
multimap<int, ATBPeriodYear> YearPeriod;
multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
ATBPaymentOptionType PaymentOption;
multimap<int, ATBDailyTicket> DailyTicket;
TimeRangeType TimeRange;
multimap<int, ATBTimeStepConfig> TimeStepConfig;
multimap<int, ATBTimeBase> TimeBase;
multimap<int, ATBCustomer> Customer;
TariffProductType TariffProduct;
TariffInterpolationType TariffInterpolations;
TariffPrepaidType TariffPrepaidOptions;
TariffCarryOverType TariffCarryOverOptions;
ATBPaymentOptionType PaymentOption;
multimap<int, ATBDailyTicket> DailyTicket;
TimeRangeType TimeRange;
multimap<int, ATBTimeStepConfig> TimeStepConfig;
multimap<int, ATBTimeBase> TimeBase;
multimap<int, ATBCustomer> Customer;
TariffProductType TariffProduct;
TariffInterpolationType TariffInterpolations;
TariffPrepaidType TariffPrepaidOptions;
TariffCarryOverType TariffCarryOverOptions;
/// <summary>
/// Parse JSON string
@@ -95,6 +95,7 @@ public:
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
std::optional<ATBInterpolation> getInterpolationType(int type) const;
std::optional<QDateTime> getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const;
std::optional<ATBPrepaid> getPrepaidType(int type) const;
std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
@@ -103,7 +104,7 @@ public:
std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
std::optional<QDateTime> adaptStart(QDateTime const &start, int prepaid_option_id);
std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
private:
/// <summary>
@@ -113,5 +114,5 @@ private:
/// <returns></returns>
MemberType IdentifyJsonMember(const char* member_name);
QVector<ATBPaymentOption> currentPaymentOptions;
QVector<ATBPaymentOption> currentPaymentOptions;
};

2
library/include/mobilisis/payment_opt.h
View File

@@ -26,6 +26,7 @@ public:
pop_carry_over = -1;
pop_carry_over_option_id = -1;
pop_prepaid_option_id = -1;
pop_truncate_last_interpolation_step = false;
pop_carry_over_target = false;
pop_carry_over_time_range_id = -1;
pop_carry_over_start_time_range = -1;
@@ -47,6 +48,7 @@ public:
double pop_max_price;
int pop_carry_over;
int pop_carry_over_option_id;
bool pop_truncate_last_interpolation_step;
int pop_prepaid_option_id;
bool pop_carry_over_target;
int pop_carry_over_time_range_id;

8
library/include/mobilisis/tariff_carryover.h
View File

@@ -10,11 +10,11 @@ struct ATBCarryOver {
bool never;
QTime static_start;
QTime static_end;
int duration;
} carryover[8];
int id;
friend QDebug operator<<(QDebug debug, ATBCarryOver const &co) {
QDebugStateSaver saver(debug);
@@ -24,24 +24,28 @@ struct ATBCarryOver {
<< " day: " << co.carryover[(int)Qt::Monday].day << "\n"
<< " static_start: " << co.carryover[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
<< " static_end: " << co.carryover[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
<< " duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
<< " anytime: " << co.carryover[(int)Qt::Monday].seemless << "\n"
<< " never: " << co.carryover[(int)Qt::Monday].never << "\n"
<< " **** Tuesday **** \n"
<< " day: " << co.carryover[(int)Qt::Tuesday].day << "\n"
<< " static_start: " << co.carryover[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
<< " static_end: " << co.carryover[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
<< " duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
<< " anytime: " << co.carryover[(int)Qt::Tuesday].seemless << "\n"
<< " never: " << co.carryover[(int)Qt::Tuesday].never << "\n"
<< " **** Wednesday **** \n"
<< " day: " << co.carryover[(int)Qt::Wednesday].day << "\n"
<< " static_start: " << co.carryover[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
<< " static_end: " << co.carryover[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
<< " duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
<< " anytime: " << co.carryover[(int)Qt::Wednesday].seemless << "\n"
<< " never: " << co.carryover[(int)Qt::Wednesday].never << "\n"
<< " **** Thursday **** \n"
<< " day: " << co.carryover[(int)Qt::Thursday].day << "\n"
<< " static_start: " << co.carryover[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
<< " static_end: " << co.carryover[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
<< " duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
<< " anytime: " << co.carryover[(int)Qt::Thursday].seemless << "\n"
<< " never: " << co.carryover[(int)Qt::Thursday].never << "\n"
<< " **** Friday **** \n"
@@ -54,12 +58,14 @@ struct ATBCarryOver {
<< " day: " << co.carryover[(int)Qt::Saturday].day << "\n"
<< " static_start: " << co.carryover[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
<< " static_end: " << co.carryover[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
<< " duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
<< " anytime: " << co.carryover[(int)Qt::Saturday].seemless << "\n"
<< " never: " << co.carryover[(int)Qt::Saturday].never << "\n"
<< " **** Sunday **** \n"
<< " day: " << co.carryover[(int)Qt::Sunday].day << "\n"
<< " static_start: " << co.carryover[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
<< " static_end: " << co.carryover[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
<< " duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
<< " anytime: " << co.carryover[(int)Qt::Sunday].seemless << "\n"
<< " never: " << co.carryover[(int)Qt::Sunday].never << "\n";

14
library/include/mobilisis/tariff_global_defines.h
View File

@@ -3,4 +3,18 @@
#define DBG_HEADER "(" << __func__ << ":" << __LINE__ << ")"
#define DBG_EMERGENCY (0) // System is unusable
#define DBG_ALERT (1) // Action must be taken immediately
#define DBG_CRITICAL (2) // Critical conditions
#define DBG_ERROR (3) // Error conditions
#define DBG_WARNING (4) // Warning conditions
#define DBG_NOTICE (5) // Normal but significant conditions
// Conditions that are not error conditions, but that may require special handling
#define DBG_INFORMATION (6) // Informational messages
// Confirmation that the program is working as expected
#define DBG_DEBUG (7) // Debug-level messages
// Messages that contain information normally of use only when debugging a program
extern int DBG_LEVEL;
#endif // TARIFF_GLOBAL_DEFINES_H_INCLUDED

16
library/include/mobilisis/tariff_interpolation.h
View File

@@ -12,7 +12,7 @@ struct ATBInterpolation {
STATIC_TIMEPOINT_AND_DURATION = 3,
DYNAMIC_TIMEPOINT_AND_STATIC_DURATION = 4,
DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION = 5,
DYNAMIC_ABSTRACT_TIMEPOINT_AND_PRICE = 6,
DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE = 6,
DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME = 7
};
@@ -28,8 +28,8 @@ struct ATBInterpolation {
return QString("%1: DYNAMIC_TIMEPOINT_AND_STATIC_DURATION").arg(i);
case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION").arg(i);
case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_PRICE):
return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_PRICE").arg(i);
case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE):
return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE").arg(i);
case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME").arg(i);
default:;
@@ -49,7 +49,9 @@ struct ATBInterpolation {
, dynamic_start_str(QString())
, dynamic_end_str(QString())
, dynamic_duration(0)
, dynamic_until_price(0) {
, dynamic_until_price(0)
, seemless(false)
, never(false) {
}
int id;
@@ -64,6 +66,8 @@ struct ATBInterpolation {
QString dynamic_end_str;
int dynamic_duration;
int dynamic_until_price;
bool seemless;
bool never;
friend QDebug operator<<(QDebug debug, ATBInterpolation const &i) {
QDebugStateSaver saver(debug);
@@ -80,7 +84,9 @@ struct ATBInterpolation {
<< " dynamic_start_str: " << i.dynamic_start_str << "\n"
<< " dynamic_end_str: " << i.dynamic_end_str << "\n"
<< " dynamic_duration: " << i.dynamic_duration << "\n"
<< "dynamic_until_price: " << i.dynamic_until_price << "\n";
<< "dynamic_until_price: " << i.dynamic_until_price << "\n"
<< " seemless: " << i.seemless << "\n"
<< " never: " << i.never << "\n";
return debug;
}