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
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 <optional>
#include <QList>
#include <QPair>
using namespace std;
using namespace rapidjson;
@@ -83,7 +85,11 @@ public:
TariffOutOfServiceType TariffOutOfServices;
ATBTariffPrepaidType TariffPrepaids;
ATBTariffCarryOverType TariffCarryOvers;
QStringList TariffIncludes;
QList<QPair<QString, QString>> TariffIncludes;
QTime ValidFrom;
int ValidForWeekDay{};
QString tariffFileName{};
/// <summary>
/// Parse JSON string
@@ -124,8 +130,8 @@ public:
std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
QStringList const &getTariffIncludes() const { return TariffIncludes; }
QStringList &getTariffIncludes() { return TariffIncludes; }
QList<QPair<QString, QString>> const &getTariffIncludes() const { return TariffIncludes; }
QList<QPair<QString, QString>> &getTariffIncludes() { return TariffIncludes; }
std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
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_CAMPER=15,
FREE_TICKET=16,
TEST_PRODUCT_1=17,
TEST_PRODUCT_2=18,
PRODUCT_MAX
};
@@ -78,6 +81,12 @@ struct PermitType {
case 16:
m_permitType = PERMIT_TYPE::FREE_TICKET;
break;
case 17:
m_permitType = PERMIT_TYPE::TEST_PRODUCT_1;
break;
case 18:
m_permitType = PERMIT_TYPE::TEST_PRODUCT_2;
break;
default:
m_permitType = PERMIT_TYPE::INVALID;
}
@@ -123,6 +132,10 @@ struct PermitType {
return 15;
case PERMIT_TYPE::FREE_TICKET:
return 16;
case PERMIT_TYPE::TEST_PRODUCT_1:
return 17;
case PERMIT_TYPE::TEST_PRODUCT_2:
return 18;
default:
break;
}
@@ -177,6 +190,12 @@ struct PermitType {
} else
if (permitTypeStr == "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;
@@ -216,6 +235,10 @@ struct PermitType {
return QString("DAY_TICKET_CAMPER");
case PERMIT_TYPE::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:
break;
}
@@ -256,6 +279,10 @@ struct PermitType {
return QString("DAY_TICKET_CAMPER");
case PERMIT_TYPE::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:
break;
}