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

Added handling for interpolation, carry over and prepaid.

Browse Source
This commit is contained in:
Gerhard Hoffmann
2024-07-19 14:01:27 +02:00
parent 026c791c79
commit c6d396f34b
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,9 @@
#include "time_range_header.h"
#include "tariff_timestep_config.h"
#include "tariff_product.h"
#include "tariff_interpolation.h"
#include "tariff_prepaid.h"
#include "tariff_carryover.h"
#include <QVector>
#include <optional>
@@ -41,6 +44,9 @@ public:
using TimeRangeType = std::multimap<int, ATBTimeRange>;
using TariffProductType = std::multimap<int, ATBTariffProduct>;
using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
ATBProject project;
ATBCurrency Currency;
@@ -61,6 +67,9 @@ public:
multimap<int, ATBTimeBase> TimeBase;
multimap<int, ATBCustomer> Customer;
TariffProductType TariffProduct;
TariffInterpolationType TariffInterpolations;
TariffPrepaidType TariffPrepaidOptions;
TariffCarryOverType TariffCarryOverOptions;
/// <summary>
/// Parse JSON string
@@ -85,6 +94,8 @@ public:
std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
std::optional<ATBInterpolation> getInterpolationType(int type) const;
std::optional<ATBPrepaid> getPrepaidType(int type) const;
std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
@@ -92,6 +103,8 @@ 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);
private:
/// <summary>
/// Identify type of JSON member