From c6d396f34b5a55e1263006f7edef1e37e4e416a0 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Fri, 19 Jul 2024 14:01:27 +0200
Subject: [PATCH] Added handling for interpolation, carry over and prepaid.

---
 library/include/mobilisis/configuration.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/library/include/mobilisis/configuration.h b/library/include/mobilisis/configuration.h
index f5f3f51..51be47e 100644
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -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