Compare commits

...

124 Commits

Author SHA1 Message Date
631378deeb Added test cases for Szeged. 2024-02-01 13:28:08 +01:00
9d713c894d Moved check if netto minutes exceed max. parking time down into loop.
If this is the case, then stop updating the end-time-date.
2024-02-01 13:19:08 +01:00
38eca50d83 Minor: more detailed debug output 2024-02-01 13:18:27 +01:00
f7af631de6 Use isParkingAllowed() to steamline source code. 2024-01-31 15:19:31 +01:00
15006e8e22 Implemement isParkingAllowed(). 2024-01-31 15:19:01 +01:00
87c0f4397b Remove meset for price. Rely on default-constructor. 2024-01-31 15:15:44 +01:00
24c6788427 Add utility isParkingAllowed() 2024-01-31 15:14:44 +01:00
f848baec83 Add defualt-constructor to struct price_t. 2024-01-31 15:13:24 +01:00
1467a69487 Add TariffTimeRange member to CalcState. Use in isParkingAllowed(). 2024-01-31 15:12:41 +01:00
0b779b7846 getBusinessHours(): return values with correct type. 2024-01-31 15:10:45 +01:00
25a39fdc61 Fix getPaymentMethodId(): check for valid iterator. 2024-01-31 15:09:42 +01:00
9438a535ea Only minor changes 2024-01-31 15:08:16 +01:00
f87399ed44 Fixed getWeekDayWorkTime(). Parameter 'time' must be inside [from, to[. 2024-01-31 11:42:33 +01:00
868df3dd32 Fixed GetDailyTicket(): use pop_id as key to find payment rate. 2024-01-31 11:40:41 +01:00
d2a85532ce Minor: changed debug output format. 2024-01-31 11:40:08 +01:00
e6399d477b CalcState: add OUTSIDE_ALLOED_PARKING_TIME status (future use). 2024-01-31 11:37:49 +01:00
f450d85bff test for naz 2024-01-31 11:37:11 +01:00
f46adac56d Fixed usage of std::optional value_or:
value = value.value_or(...)
2024-01-30 14:05:40 +01:00
c799c24658 Removed local variable PaymentOption. Replaced by usage of currentPaymentOption-vector. 2024-01-30 14:04:58 +01:00
dbcd27b377 Change testcase for Szeged 2024-01-30 14:00:55 +01:00
c2a8f0b00b Begin testcase for NAZ 2024-01-30 10:53:43 +01:00
088453c179 current tariff-file for naz 2024-01-30 10:52:49 +01:00
8077167498 Minor: remove unused protection_counter variable 2024-01-30 10:52:24 +01:00
5deaa48f8e Implement:
getDailyTicketsForAllKeys(), getDailyTicketsForKey(), getPaymentRateForAllKeys(),
getPaymentRateForKey(), getCustomerForType() and getWeekDayWorkTime().
2024-01-30 10:49:30 +01:00
3a6a47725f Re-implement accessors for payment-option(s). 2024-01-30 10:48:05 +01:00
17968082f1 Insert Customer in cfg->customer multimap 2024-01-30 10:47:04 +01:00
7dcd7a624b Minor: debug output 2024-01-30 10:46:44 +01:00
5464054f65 Parsing of PaymentOption(s): there can be several of them 2024-01-30 10:45:32 +01:00
e1ab060dc3 Parsing of Customer in tariff-file. 2024-01-30 10:44:58 +01:00
8aa9aa497a Persing of DailyTicket entry in tariff-file 2024-01-30 10:44:25 +01:00
4c1cd45866 Implemented compute_price_for_daily_ticket(). 2024-01-30 10:41:29 +01:00
6bf3960349 Re-implemented get_minimal_parkingtime() using PERMIT_TYPE-parameter.
Implemented get_maximal_parkingtime(), get_minimal_parkingprice()
and get_maximal_parkingprice().
2024-01-30 10:39:24 +01:00
9899fe76fe Add GetDailyTicketPrice() and GetPriceSteps(). 2024-01-30 10:37:30 +01:00
7bb2cbf01e Add m_priceSteps, ResetPriceSteps() and priceSteps(). 2024-01-30 10:37:10 +01:00
689bf9b3ba Added compute_price_for_daily_ticket(). 2024-01-30 10:33:11 +01:00
4c07d9fdb9 get_minimal_parking_time() -> new PERMIT_TYPE parameter
Added:
  get_maximal_parking_time()
  get_minimal_parkingprice()
  get_maximal_parkingprice().
2024-01-30 10:31:03 +01:00
1e866c74e2 Minot: fix alignment. 2024-01-30 10:30:11 +01:00
c39b3527e1 Add enum PERMIT_TYPE. 2024-01-30 10:29:25 +01:00
f8dc59532c Implemented GetDailyTicketPrice().
To be tested.
2024-01-30 10:27:46 +01:00
1ea42f88ba Added dummy member GetPriceSteps().
To implement in a later step.
2024-01-30 10:25:50 +01:00
0af858daea Added multimap for Customer.
Using std::optional.

Added member functions:
  QVector<ATBPaymentOption> &getAllPaymentOptions()
  QVector<ATBPaymentOption> const &getAllPaymentOptions() const
  std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const
  std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const
  std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const
  std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const
  std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType)
  std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek)

Removed: QVector<ATBDailyTicket> const &getDailyTickets() const;
2024-01-30 10:20:42 +01:00
3311537fee Add reset(). Changed print-format. 2024-01-30 10:17:56 +01:00
5b8ac6cc59 Add AllDaysWithRestrictedHours. 2024-01-30 10:16:55 +01:00
809df53658 Add reset() 2024-01-30 10:16:16 +01:00
ea5ca54c4c Add cust_id. Changed print-format. 2024-01-30 10:15:39 +01:00
b347b6e50e Minor: add debug output 2024-01-30 10:14:21 +01:00
124fd60c41 Add testcases for schoenau 2024-01-24 16:36:29 +01:00
f40ae7200b GetCostFromDuration public for testing 2024-01-24 16:35:58 +01:00
1173732172 removed typo 2024-01-23 11:03:42 +01:00
1b933c05a6 Remove static instance of calculator. Replaced with use of Calculator-singleton-calss. 2024-01-23 10:55:00 +01:00
ac45ebb926 GetTimeSteps(): compute time step only once, when calling get_minimal_parkingprice().
Otherwise use timeSteps-member in Calculator.
2024-01-23 10:53:26 +01:00
9af39fa83f Turn Calculator into a singletome and move the list of timesteps inside calculator. 2024-01-23 10:51:25 +01:00
17ae11212a Test cases 2024-01-23 10:50:42 +01:00
89b7589600 Minor: add debug output 2024-01-23 09:02:55 +01:00
179d3348b9 Minor: Fixed typo 2024-01-22 15:44:13 +01:00
b43fa274bd Implement get_minimal_parkingtime() and get_time_steps(). 2024-01-22 15:41:20 +01:00
0ce630dfa3 Add get_minimum_parkingtime() 2024-01-22 15:39:47 +01:00
0671a6dde6 Add get_time_steps(). 2024-01-22 14:46:40 +01:00
d7757773bd Implement get_calculator() 2024-01-22 14:29:02 +01:00
99a3c34d53 forward declare class Calculator 2024-01-22 14:28:22 +01:00
6ce8a86c5f Added get_calculator(): access for Calculator instance 2024-01-22 14:26:57 +01:00
bcd5aaf932 Minor: add debug output 2024-01-22 13:41:50 +01:00
acb88efc5a re-add 'private' 2024-01-22 13:37:44 +01:00
e9b10166d2 Minor: implement getPaymentOptions() for const. Add getPaymentOptions() for non-const 2024-01-22 13:33:23 +01:00
33731faba9 GetTimeSteps(): compute minimal parking time and set pop_min_time. 2024-01-22 13:31:00 +01:00
15700a363d Remove m_start member.
Add defualt parameter start for GetTimeSteps().
2024-01-22 13:28:38 +01:00
506a665592 provide GetPaymentOptions() with two signatures. 2024-01-22 13:27:21 +01:00
7679eb9481 Remove 'VERSION' in project file ...
'VERSION' conflicts with 'EXTRA_QMAKEVARS_PRE' in yocto recipe.
2024-01-22 10:50:59 +01:00
a8de97a528 Initialize TimeBase multimap. 2024-01-22 10:24:32 +01:00
ed6592c273 Add:
multimap<int, ATBTimeBase> TimeBase
2024-01-22 10:23:41 +01:00
cc702a413e Minor: add compile switches -g -O 2024-01-18 15:05:15 +01:00
51a58bfa15 Minor: Add VERSION variable 2024-01-18 15:03:24 +01:00
ff314c810f Add TimeBase to configuration object. 2024-01-18 15:00:42 +01:00
80fa2fe0e2 Extend computation of time steps in GetTimeSteps() for the case
of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).
2024-01-18 14:57:04 +01:00
89e0f2137b Add handling of pun_duration_min and pun_duration_max 2024-01-18 14:56:20 +01:00
f68d8816c0 Add handling of pop_carry_over_time_range_id and pop_time_step_config. 2024-01-18 14:55:16 +01:00
7ce93ddd7a Extend handling of TimeRangeType. 2024-01-18 14:53:57 +01:00
7f8ed9165d Add handling for TimeStepConfig. 2024-01-18 14:53:01 +01:00
0b901954aa Add members m_start and m_timeStepCompensation (used for Neuhauser, Galtuer (745) at the moment).
Add several setters/getters.
2024-01-18 14:49:56 +01:00
9f4b10bb9a Add and fill
multimap<int, ATBTimeRange> TimeRange;
multimap<int, ATBTimeStepConfig> TimeStepConfig;
when parsing json-file.
2024-01-18 14:43:08 +01:00
2f939d607d Add
include/mobilisis/tariff_timebase.h
include/mobilisis/tariff_timestep_config.h
2024-01-18 14:41:54 +01:00
283e970be4 Add pun_duration_min and pun_duration_max 2024-01-18 14:41:12 +01:00
e14edea07f Add TimeRangeType and TimeStepConfigType. 2024-01-18 14:39:57 +01:00
e520965c6b Add pop_carry_over_time_range_id and pop_time_step_config 2024-01-18 14:38:13 +01:00
6a781f0d3b Minor: add debug output 2024-01-18 14:37:13 +01:00
c357cbbbe0 Add descrption file for tariff time step config 2024-01-18 14:36:28 +01:00
b4940e98fe Add test for NEUHAUSER_BILEXA_GALTUER 2024-01-18 14:34:57 +01:00
b8a5803613 Add tariff-file for galtuer. 2024-01-18 14:33:44 +01:00
6a79c6c463 Adapt TimeBase description. 2024-01-18 14:32:32 +01:00
528b3882a0 renamed 2024-01-17 08:23:19 +01:00
7d274f807e delete useless files 2024-01-17 08:21:08 +01:00
e977665649 delete useless files 2024-01-17 08:19:37 +01:00
44a94b7007 Minor: add comment 2024-01-16 11:56:54 +01:00
7c13d8b88c Added pun_duration_min and pun_duration_max in case we dont have to pay for a full time range 2024-01-16 11:56:12 +01:00
64bc639eaa delete (useless) 2024-01-07 16:09:16 +01:00
f0312bc8fb another books 2023-12-22 13:19:06 +01:00
37052e97fc Add some vue books/docs. 2023-12-21 15:49:35 +01:00
8cf816c158 Add testcases for naz 2023-12-15 13:28:58 +01:00
f1f5ac8900 Add operator << for printing 2023-12-15 13:28:34 +01:00
ddded411aa Add operator << for printing 2023-12-15 13:28:19 +01:00
96587229e2 Add operator << for printing 2023-12-15 13:28:04 +01:00
3d3794ea4e Add multimap for dailly ticket.w 2023-12-15 13:27:02 +01:00
bb83ae3074 Fix: add a 'break' in swich/case. 2023-12-15 13:25:09 +01:00
c598014dd0 Add parsing of
ATBDailyTicket DailyTicket;
        ATBTimeBase TimeBase;
        ATBCustomer Customer;
        ATBTimeRange TimeRange;
2023-12-15 13:24:29 +01:00
ad534eef09 Add 4 new data type for IdentifyJsonMember(). 2023-12-15 13:22:49 +01:00
5ee73bf804 IdentifyJsonMember(): add 4 new data types:
DailyTicket, TimeBase, Customer and TimeRange.
2023-12-15 13:20:42 +01:00
ef7fff79c9 draft for tarif in naz 2023-12-15 13:18:12 +01:00
ea2dfa144f Add new menber types: dailly ticket, timebase, time range and customer. 2023-12-12 17:56:26 +01:00
f56979a61a Minor: rename to ATBCustomer. 2023-12-12 17:55:44 +01:00
cc07b8f20e Minor: rename to ATBTimeBase 2023-12-12 17:55:06 +01:00
81459f7ab4 Minor: remove 'pragma onc' 2023-12-12 17:50:23 +01:00
db7fe35095 Add some new ideas. 2023-12-12 12:14:54 +01:00
08e89df5a5 Include 3 new header files. 2023-12-12 12:14:34 +01:00
d6324f03a8 Add drafts for 3 new haeder files. 2023-12-12 12:14:14 +01:00
2b3ee3f384 Renamed again. 2023-12-12 12:11:32 +01:00
08f8f3a9fd "" 2023-12-12 12:10:55 +01:00
a80bc7294a Removed tartiff_csutomer. 2023-12-12 12:00:04 +01:00
3a0baf266b Add first draft. 2023-12-12 11:59:35 +01:00
31193336cf Define daily ticket structure. 2023-12-12 11:53:22 +01:00
4fbc2c502b Header for definition of daily ticket. 2023-12-12 11:36:58 +01:00
8d7d175b51 GetDailyTicketDuration():
replace ZellersAlgorithm by qts build in method dayOfWeek().
2023-12-12 11:34:04 +01:00
ebb5bad7c5 Minor: replace call to LOG_ERROR() using qCritical(). 2023-12-12 11:30:30 +01:00
b122206a94 Minor add some json files under OTHER_FILES for documentation. 2023-12-12 11:08:10 +01:00
83807a0f99 Add tariff-files for documentation under OTHERFILES. 2023-12-12 11:05:13 +01:00
29 changed files with 3027 additions and 197 deletions

View File

@@ -3,6 +3,7 @@
#include <time.h>
#include <inttypes.h>
#include "tariff_time_range.h"
#include <QString>
#include <QDateTime>
@@ -31,6 +32,22 @@ struct CALCULATE_LIBRARY_API price_t {
double brutto;
double vat_percentage;
double vat;
explicit price_t() {
units = 0;
netto = brutto = vat_percentage = vat = 0.0;
}
};
enum class PERMIT_TYPE : quint8 {
SHORT_TERM_PARKING,
DAY_TICKET,
SZEGED_START,
SZEGED_STOP,
DAY_TICKET_ADULT,
DAY_TICKET_TEEN,
DAY_TICKET_CHILD,
INVALID
};
struct CALCULATE_LIBRARY_API CalcState {
@@ -46,13 +63,31 @@ struct CALCULATE_LIBRARY_API CalcState {
ABOVE_MAX_PARKING_TIME,
BELOW_MIN_PARKING_TIME,
BELOW_MIN_PARKING_PRICE,
OVERPAID
OVERPAID,
OUTSIDE_ALLOWED_PARKING_TIME
};
State m_status;
QString m_desc;
TariffTimeRange m_allowedTimeRange;
explicit CalcState() : m_status(State::SUCCESS), m_desc("") {}
explicit CalcState()
: m_status(State::SUCCESS)
, m_desc("") {
}
explicit CalcState(State state, QString desc = "")
: m_status(state)
, m_desc(desc) {
}
explicit CalcState(State state, QString desc = "",
QTime const &from = QTime(),
QTime const &until = QTime())
: m_status(state)
, m_desc(desc)
, m_allowedTimeRange(from, until) {
}
explicit operator bool() const noexcept {
return (m_status == State::SUCCESS);
@@ -75,7 +110,7 @@ struct CALCULATE_LIBRARY_API CalcState {
break;
case State::NEGATIVE_PARING_TIME:
s = "NEGATIVE_PARKING_TIME";
break;
break;
case State::ABOVE_MAX_PARKING_TIME:
s = "ABOVE_MAX_PARKING_TIME";
break;
@@ -96,12 +131,23 @@ struct CALCULATE_LIBRARY_API CalcState {
break;
case State::WRONG_ISO_TIME_FORMAT:
s = "WRONG_ISO_TIME_FORMAT";
break;
case State::OUTSIDE_ALLOWED_PARKING_TIME:
s = "OUTSIDE_ALLOWED_PARKING_TIME";
}
return s + ":" + m_desc;
}
CalcState &set(State s) { m_status = s; return *this; }
CalcState &setDesc(QString s) { m_desc = s; return *this; }
void setAllowedTimeRange(QTime const &from, QTime const &until) {
m_allowedTimeRange.setTimeRange(from, until);
}
TariffTimeRange getAllowedTimeRange() {
return m_allowedTimeRange;
}
};
CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
@@ -111,6 +157,12 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket( // deprecated
parking_tariff_t *tariff,
time_t start_parking_time,
@@ -140,6 +192,13 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
parking_tariff_t *tariff,
QDateTime const &start_parking_time,
QDateTime &ticketEndTime);
CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
parking_tariff_t *tariff,
QDateTime const &start_parking_time,
QDateTime &ticketEndTime,
PERMIT_TYPE permitType,
struct price_t *price);
//#ifdef __cplusplus
//} // extern "C"
//#endif

View File

@@ -5,6 +5,7 @@
#include <optional>
#include "configuration.h"
#include "calculate_price.h"
#include "payment_method.h"
#include "ticket.h"
#include "tariff_time_range.h"
@@ -12,9 +13,29 @@
#include <QDateTime>
using namespace std;
class Calculator
{
class Calculator {
mutable QList<int> m_timeSteps;
mutable QList<int> m_priceSteps;
protected:
explicit Calculator() = default;
public:
Calculator(Calculator const &other) = delete;
void operator=(Calculator const &) = delete;
static Calculator &GetInstance() {
static Calculator c;
return c;
}
void ResetTimeSteps() { m_timeSteps.clear(); }
QList<int> timeSteps() const { return m_timeSteps; }
void ResetPriceSteps() { m_priceSteps.clear(); }
QList<int> priceSteps() const { return m_priceSteps; }
CalcState isParkingAllowed(Configuration const *cfg, QDateTime const &start);
/// <summary>
/// Gets duration in seconds from cost
@@ -39,6 +60,7 @@ public:
// Daily ticket
QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
std::optional<struct price_t> GetDailyTicketPrice(Configuration* cfg, QDateTime const &startDatetime, QDateTime &endTime, PERMIT_TYPE permitType);
//
// helper function to find time steps for a tariff with PaymentMethod::Steps
@@ -47,6 +69,8 @@ public:
QList<int> GetTimeSteps(Configuration *cfg) const;
QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); }
QList<int> GetPriceSteps(Configuration *cfg) const;
// additional helper functions
bool noSpecialDays(Configuration const *cfg) const {
return (cfg->SpecialDays.size() == 0) && (cfg->SpecialDaysWorktime.size() == 0);
@@ -60,12 +84,13 @@ public:
cfg->SpecialDaysWorktime.size() == 0);
}
private:
// testing public:
// Introduced for PaymentMethod::Steps (e.g. Schoenau)
// For tariff of following structure: only steps, no special days, nonstop.
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
private:
Ticket private_GetCostFromDuration(Configuration const* cfg,
QDateTime const &start,
int durationMinutes,

View File

@@ -21,10 +21,17 @@
#include "period_year.h"
#include "payment_rate.h"
#include "atb_project.h"
#include "tariff_daily_ticket.h"
#include "time_range_header.h"
#include "tariff_timestep_config.h"
#include <QVector>
#include <optional>
using namespace std;
using namespace rapidjson;
class Calculator;
class Configuration
{
public:
@@ -41,6 +48,11 @@ public:
multimap<int, ATBPeriodYear> YearPeriod;
multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
multimap<int, ATBPaymentOption> PaymentOption;
multimap<int, ATBDailyTicket> DailyTicket;
multimap<int, ATBTimeRange> TimeRange;
multimap<int, ATBTimeStepConfig> TimeStepConfig;
multimap<int, ATBTimeBase> TimeBase;
multimap<int, ATBCustomer> Customer;
/// <summary>
/// Parse JSON string
@@ -49,7 +61,16 @@ public:
/// <returns>Returns operation status bool (OK | FAIL) </returns>
bool ParseJson(Configuration* cfg, const char* json);
ATBPaymentOption const & getPaymentOptions();
ATBPaymentOption &getPaymentOptions();
ATBPaymentOption const &getPaymentOptions() const;
QVector<ATBPaymentOption> &getAllPaymentOptions();
QVector<ATBPaymentOption> const &getAllPaymentOptions() const;
std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
private:
/// <summary>
@@ -59,5 +80,5 @@ private:
/// <returns></returns>
MemberType IdentifyJsonMember(const char* member_name);
ATBPaymentOption currentPaymentOptions;
QVector<ATBPaymentOption> currentPaymentOptions;
};

View File

@@ -1,4 +1,3 @@
#pragma once
#include <string>
class ATBDuration
@@ -7,4 +6,6 @@ public:
int pun_id;
std::string pun_label;
int pun_duration;
};
int pun_duration_min;
int pun_duration_max;
};

View File

@@ -1,4 +1,5 @@
#pragma once
#ifndef MEMBER_TYPE_H_INCLUDED
#define MEMBER_TYPE_H_INCLUDED
enum MemberType
{
@@ -12,5 +13,12 @@ enum MemberType
WeekDaysWorkTimeType = 0x06,
SpecialDaysWorktimeType = 0x07,
SpecialDaysType = 0x08,
PeriodYearType = 0x09
};
PeriodYearType = 0x09,
DailyTicketType = 0x0A,
CustomerType = 0x0B,
TimeBaseType = 0x0C,
TimeRangeType = 0x0D,
TimeStepConfigType = 0x0E
};
#endif // MEMBER_TYPE_H_INCLUDED

View File

@@ -6,6 +6,23 @@ class ATBPaymentOption
public:
ATBPaymentOption() = default;
void reset() {
pop_id = 0;
pop_label = "";
pop_payment_method_id = 0;
pop_day_end_time = "";
pop_day_night_end_time = "";
pop_price_night = 0;
pop_min_time = 0;
pop_max_time = 0;
pop_min_price = 0;
pop_carry_over = -1;
pop_carry_over_time_range_id = -1;
pop_daily_card_price = -1;
pop_business_hours = -1;
pop_time_step_config = -1;
}
int pop_id;
std::string pop_label;
int pop_payment_method_id;
@@ -16,6 +33,8 @@ public:
double pop_max_time;
double pop_min_price;
int pop_carry_over;
int pop_carry_over_time_range_id;
int pop_daily_card_price;
int pop_business_hours;
int pop_time_step_config;
};

View File

@@ -15,6 +15,7 @@ enum BusinessHours
OnlySchoolHolidays = 32,
SpecialAndSchoolHolidays = 48,
OnlyOpenForBusinessDays = 64, // verkaufsoffen
AllDaysWithRestrictedHours = 128, // every day, restricted to some time range
NoBusinessHoursDefined = 255
};

View File

@@ -0,0 +1,47 @@
#ifndef TARIFF_CUSTOMER_H_INCLUDED
#define TARIFF_CUSTOMER_H_INCLUDED
#include <QString>
#include <QDebug>
#include <QDebugStateSaver>
struct ATBCustomer {
enum class CustomerType {ADULT=1000, CHILD, TEEN};
ATBCustomer() = default;
int cust_id;
CustomerType cust_type;
QString cust_label;
friend QDebug operator<<(QDebug debug, ATBCustomer const &customer) {
QDebugStateSaver saver(debug);
debug.nospace() << "CUSTOMER" << "\n";
switch(customer.cust_type) {
case ATBCustomer::CustomerType::ADULT:
debug.nospace()
<< " cust_id: " << customer.cust_id << "\n"
<< " cust_type: " << "CustomerType::ADULT" << "\n"
<< "cust_label: " << customer.cust_label << "\n";
break;
case ATBCustomer::CustomerType::CHILD:
debug.nospace()
<< " cust_id: " << customer.cust_id << "\n"
<< " cust_type: " << "CustomerType::CHILD" << "\n"
<< "cust_label: " << customer.cust_label << "\n";
break;
case ATBCustomer::CustomerType::TEEN:
debug.nospace()
<< " cust_id: " << customer.cust_id << "\n"
<< " cust_type: " << "CustomerType::TEEN" << "\n"
<< "cust_label: " << customer.cust_label << "\n";
break;
}
return debug;
}
};
#endif // TARIFF_CUSTOMER_H_INCLUDED

View File

@@ -0,0 +1,67 @@
#ifndef TARIFF_DAILY_TICKET_H_INCLUDED
#define TARIFF_DAILY_TICKET_H_INCLUDED
#include <QString>
#include <QDateTime>
#include <QDebug>
#include <QVector>
#include <QDebugStateSaver>
#include "tariff_customer.h"
#include "tariff_time_range.h"
#include "tariff_timebase.h"
struct ATBDailyTicket {
ATBDailyTicket() = default;
int daily_ticket_payment_option_id;
int daily_ticket_id;
int daily_ticket_price_id;
int daily_ticket_tb_id;
// time base setting for ticket:
// absolute: using time stamps
// relative: use offsets from
// some reference time point,
// typically "start time".
QVector<int> daily_ticket_clearance_customer_ids;
// who is allowed to buy the ticket:
// list of customer types
QTime daily_ticket_from_min; // absolute time base
QTime daily_ticket_to_max;
int daily_ticket_from_offset_min; // relative time base
int daily_ticket_to_offset_max;
void reset() {
daily_ticket_payment_option_id = 0;
daily_ticket_id = 0;
daily_ticket_price_id = 0;
daily_ticket_tb_id = 0;
daily_ticket_clearance_customer_ids.clear();
daily_ticket_from_min = QTime();
daily_ticket_to_max = QTime();
daily_ticket_from_offset_min = 0;
daily_ticket_to_offset_max = 0;
}
friend QDebug operator<<(QDebug debug, ATBDailyTicket const &ticket) {
QDebugStateSaver saver(debug);
debug.nospace()
<< "DAILY TICKET " << "\n"
<< " daily_ticket_id: " << ticket.daily_ticket_id << "\n"
<< " daily_ticket_payment_option_id: " << ticket.daily_ticket_payment_option_id << "\n"
<< " daily_ticket_tbase_id: " << ticket.daily_ticket_tb_id << "\n"
<< " daily_ticket_price_id: " << ticket.daily_ticket_price_id << "\n"
<< "daily_ticket_clearance_customer_ids: " << ticket.daily_ticket_clearance_customer_ids << "\n"
<< " daily_ticket_from_min: " << ticket.daily_ticket_from_min.toString(Qt::ISODate) << "\n"
<< " daily_ticket_to_min: " << ticket.daily_ticket_to_max.toString(Qt::ISODate) << "\n";
return debug;
}
};
#endif // TARIFF_DAILY_TICKET_H_INCLUDED

View File

@@ -1,4 +1,3 @@
// #pragma once
/// <summary>
/// Duration data
@@ -6,7 +5,9 @@
class TariffDuration
{
public:
int pun_id;
std::string pun_label;
int pun_duration;
int pun_id;
std::string pun_label;
int pun_duration;
int pun_duration_min;
int pun_duration_max;
};

View File

@@ -7,8 +7,8 @@
/// Time range definition
/// </summary>
class TariffTimeRange {
QTime m_time_from;
QTime m_time_until;
QTime m_time_from; // if m_time_from == m_time_until, then the time range
QTime m_time_until; // actually is the time point m_time_from
public:

View File

@@ -0,0 +1,44 @@
#ifndef TARIFF_TIME_BASE_H_INCLUDED
#define TARIFF_TIME_BASE_H_INCLUDED
#include <QString>
#include <QDebug>
#include <QDebugStateSaver>
struct ATBTimeBase {
enum class TimeBaseType {ABSOLUTE=0, RELATIVE=1};
ATBTimeBase() = default;
int tbase_id;
TimeBaseType tbase_type;
QString tbase_label;
friend QDebug operator<<(QDebug debug, ATBTimeBase const &timeBase) {
QDebugStateSaver saver(debug);
debug.nospace() << "TIMEBASE" << "\n";
switch(timeBase.tbase_type) {
case ATBTimeBase::TimeBaseType::ABSOLUTE:
debug.nospace()
<< " tbase_id: " << timeBase.tbase_id << "\n"
<< " tbase_type: " << "TimeBaseType::ABSOLUTE" << "\n"
<< "tbase_label: " << timeBase.tbase_label << "\n";
break;
case ATBTimeBase::TimeBaseType::RELATIVE:
debug.nospace()
<< " tbase_type: " << "TimeBaseType::RELATIVE" << "\n"
<< "tbase_label: " << timeBase.tbase_label << "\n";
break;
default:
debug.nospace()
<< " tbase_type: " << "TimeBaseType::???" << "\n";
break;
}
return debug;
}
};
#endif // TARIFF_TIME_BASE_H_INCLUDED

View File

@@ -0,0 +1,26 @@
#ifndef TARIFF_TIMESTEP_CONFIG_H_INCLUDED
#define TARIFF_TIMESTEP_CONFIG_H_INCLUDED
#include <QString>
#include <QDebug>
#include <QDebugStateSaver>
struct ATBTimeStepConfig {
enum class TimeStepConfig {STATIC=1, DYNAMIC=2};
ATBTimeStepConfig() = default;
int tsconfig_id;
QString tsconfig_label;
friend QDebug operator<<(QDebug debug, ATBTimeStepConfig const &tsConfig) {
QDebugStateSaver saver(debug);
debug.nospace()
<< " tsconfig_id: " << tsConfig.tsconfig_id << "\n"
<< "tsconfig_label: " << tsConfig.tsconfig_label << "\n";
return debug;
}
};
#endif // TARIFF_TIMESTEP_CONFIG_H_INCLUDED

View File

@@ -1,8 +1,12 @@
#pragma once
#ifndef TIME_RANGE_H_INCLUDED
#define TIME_RANGE_H_INCLUDED
#include "time_range_header.h"
struct TimeRange {
public:
bool IsActive;
ATBTimeRange TimeRangeStructure;
};
};
#endif // TIME_RANGE_H_INCLUDED

View File

@@ -1,8 +1,27 @@
#pragma once
#include <ctime>
#ifndef TIME_RANGE_HEADER_H_INCLUDED
#define TIME_RANGE_HEADER_H_INCLUDED
class ATBTimeRange {
public:
time_t time_from;
time_t time_to;
};
#include <QString>
#include <QDateTime>
#include <QDebug>
#include <QDebugStateSaver>
struct ATBTimeRange {
int time_range_id;
QTime time_range_from;
QTime time_range_to;
friend QDebug operator<<(QDebug debug, ATBTimeRange const &timeRange) {
QDebugStateSaver saver(debug);
debug.nospace()
<< " time_range_id: " << timeRange.time_range_id << "\n"
<< "time_range_from: " << timeRange.time_range_from.toString(Qt::ISODate) << "\n"
<< " time_range_to: " << timeRange.time_range_to.toString(Qt::ISODate) << "\n";
return debug;
}
};
#endif // TIME_RANGE_HEADER_H_INCLUDED

View File

@@ -8,6 +8,10 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include
INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
#start version with project neuhauser/galtuer
#Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
#VERSION=1.0.0
CONFIG(debug, debug|release) {
win32 {
QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
@@ -69,9 +73,16 @@ HEADERS += \
include/mobilisis/calculate_price.h \
include/mobilisis/atb_project.h \
include/mobilisis/ticket.h \
include/mobilisis/tariff_business_hours.h
include/mobilisis/tariff_business_hours.h \
include/mobilisis/tariff_daily_ticket.h \
include/mobilisis/tariff_customer.h \
include/mobilisis/tariff_timebase.h \
include/mobilisis/tariff_timestep_config.h
OTHER_FILES += src/main.cpp
OTHER_FILES += src/main.cpp \
../tariffs/tariff_korneuburg.json \
../tariffs/tariff_linsinger_maschinenbau.json \
../tariffs/tariff_naz.json
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin

View File

@@ -8,8 +8,101 @@
#include <QFileInfo>
#include <QDateTime>
#include <QDebug>
#include <QList>
static Calculator calculator;
QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
return Calculator::GetInstance().GetTimeSteps(cfg);
}
int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType) {
int minTime = 0;
switch(permitType) {
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
minTime = cfg->getPaymentOptions().pop_min_time;
} break;
case PERMIT_TYPE::DAY_TICKET_ADULT: {
} break;
case PERMIT_TYPE::DAY_TICKET_TEEN: {
} break;
case PERMIT_TYPE::DAY_TICKET_CHILD: {
} break;
default:
// for each new sell-procedure, recomute the timesteps. implicitly, set
// the minimal parking time.
Calculator::GetInstance().ResetTimeSteps();
Calculator::GetInstance().GetTimeSteps(cfg);
minTime = qRound(cfg->getPaymentOptions().pop_min_time);
}
return minTime;
}
int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType) {
int maxTime = 0;
switch(permitType) {
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
maxTime = cfg->getPaymentOptions().pop_max_time;
} break;
case PERMIT_TYPE::DAY_TICKET_ADULT: {
} break;
case PERMIT_TYPE::DAY_TICKET_TEEN: {
} break;
case PERMIT_TYPE::DAY_TICKET_CHILD: {
} break;
default: ;
}
return maxTime;
}
int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
int minPrice = -1;
switch(permitType) {
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
minPrice = cfg->getPaymentOptions().pop_min_price;
} break;
case PERMIT_TYPE::DAY_TICKET_ADULT: {
} break;
case PERMIT_TYPE::DAY_TICKET_TEEN: {
} break;
case PERMIT_TYPE::DAY_TICKET_CHILD: {
} break;
default: ;
}
return minPrice;
}
int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
int maxPrice = -1;
switch(permitType) {
case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
int const key = cfg->getPaymentOptions().pop_id;
int const maxTime = cfg->getPaymentOptions().pop_max_time; // maxTime is given in minutes
std::optional<QVector<ATBPaymentRate>> const &pv = cfg->getPaymentRateForKey(key);
if (pv) {
QVector<ATBPaymentRate> const &paymentRate = pv.value();
if (paymentRate.size() > 0) {
int const price = paymentRate.at(0).pra_price; // price is given per hour
maxPrice = qRound((maxTime * price) / 60.0f);
}
}
} break;
case PERMIT_TYPE::DAY_TICKET_ADULT:
break;
case PERMIT_TYPE::DAY_TICKET_TEEN:
break;
case PERMIT_TYPE::DAY_TICKET_CHILD:
break;
default: ;
}
return maxPrice;
}
int CALCULATE_LIBRARY_API get_zone_nr(int zone)
{
@@ -97,7 +190,9 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
// UpDown 1 -> up; 0 -> down
int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
{
qCritical() << " compute_next_timestep() currentTimeMinutes: " << currentTimeMinutes;
qCritical() << " compute_next_timestep() currentTimeMinutes: " << currentTimeMinutes;
qCritical() << " compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
Configuration const *cfg = tariff;
// compute payment method id (e.g. Linear=3, Steps=4)
@@ -124,7 +219,8 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
if (paymentMethodId == PaymentMethod::Steps)
{
static const QList<int> stepList = calculator.GetTimeSteps(tariff);
const QList<int> stepList = Calculator::GetInstance().GetTimeSteps(tariff);
qCritical() << " compute_next_timestep() timeSteps:" << stepList;
int currentStepIndex = stepList.indexOf(currentTimeMinutes);
@@ -215,7 +311,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
}
if (duration == 0) {
memset(price, 0x00, sizeof(*price));
return calcState.set(CalcState::State::SUCCESS);
}
@@ -225,7 +320,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
start = start.toLocalTime().addSecs(start_parking_time * 60);
QDateTime end(start);
if (start.isValid()) {
double cost = calculator.GetCostFromDuration(
double cost = Calculator::GetInstance().GetCostFromDuration(
tariff,
tariff->getPaymentOptions().pop_payment_method_id,
start,
@@ -279,12 +374,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
}
if (netto_parking_time == 0) {
memset(price, 0x00, sizeof(*price));
return calcState.set(CalcState::State::SUCCESS);
}
if (start_parking_time.isValid()) {
double cost = calculator.GetCostFromDuration(
double cost = Calculator::GetInstance().GetCostFromDuration(
tariff,
tariff->getPaymentOptions().pop_payment_method_id,
start_parking_time, // starting time
@@ -327,7 +421,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
qCritical() << " start (cs): " << cs;
qCritical() << " price: " << price;
duration = calculator.GetDurationFromCost(tariff,
duration = Calculator::GetInstance().GetDurationFromCost(tariff,
tariff->getPaymentOptions().pop_payment_method_id,
cs.toLocal8Bit().constData(),
price, false, true).c_str();
@@ -352,7 +446,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
CalcState calcState;
if (start_parking_time.isValid()) {
QString cs = start_parking_time.toString(Qt::ISODate);
QString endTime = calculator.GetDurationFromCost(
QString endTime = Calculator::GetInstance().GetDurationFromCost(
tariff,
tariff->getPaymentOptions().pop_payment_method_id,
cs.toLocal8Bit().constData(),
@@ -380,7 +474,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
CalcState calcState;
if (start_parking_time.isValid()) {
ticketEndTime = calculator.GetDailyTicketDuration(tariff,
ticketEndTime = Calculator::GetInstance().GetDailyTicketDuration(tariff,
start_parking_time,
tariff->getPaymentOptions().pop_payment_method_id,
false); // carry over
@@ -401,3 +495,27 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
return calcState.set(CalcState::State::SUCCESS);
}
CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
parking_tariff_t *tariff,
QDateTime const &startDatetime,
QDateTime &endDatetime,
PERMIT_TYPE permitType,
struct price_t *price) {// return value
CalcState calcState;
if (startDatetime.isValid()) {
if (std::optional<struct price_t> p =
Calculator::GetInstance().GetDailyTicketPrice(tariff,
startDatetime,
endDatetime,
permitType)) {
*price = p.value();
}
} else {
return calcState.set(CalcState::State::INVALID_START_DATE);
}
return calcState.set(CalcState::State::SUCCESS);
}

View File

@@ -39,7 +39,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
if(daily_card_price <= 0) {
LOG_ERROR("Calculator::GetDailyTicketDuration(): Daily ticket price zero or less");
qCritical() << "Calculator::GetDailyTicketDuration(): Daily ticket price zero or less";
return QDateTime();
}
@@ -74,12 +74,10 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
else
{
// Get day of week
int weekdayId = 0;
weekdayId = Utilities::ZellersAlgorithm(inputDateTime.date().day(),inputDateTime.date().month(),inputDateTime.date().year());
int const weekdayId = inputDateTime.date().dayOfWeek();
// If no working day found, skip it (recursively call method again)
size_t found = 0;
found = cfg->WeekDaysWorktime.count(weekdayId);
size_t found = cfg->WeekDaysWorktime.count(weekdayId);
// When no workday found, go to next available day
if(found <=0)
@@ -136,30 +134,17 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
return inputDate.toString(Qt::ISODate).toStdString();
} else {
QDateTime const &start = QDateTime::fromString(start_datetime, Qt::ISODate);
if (Utilities::IsYearPeriodActive(cfg, start)) {
if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
if (!prepaid) {
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
if (businessHours == BusinessHours::OnlyWeekDays) {
int const weekdayId = start.date().dayOfWeek();
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
for (WTIterator itr = p.first; itr != p.second; ++itr) {
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
QTime const& startTime = start.time();
if (from <= startTime && startTime <= until) {
return inputDate.addSecs(GetDurationForPrice(cfg, price) * 60).toString(Qt::ISODate).toStdString();
}
}
CalcState cs = isParkingAllowed(cfg, inputDate);
if (cs) {
inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
return inputDate.toString(Qt::ISODate).toStdString();
}
}
qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
return 0;
qCritical() << __func__ << ":" << __LINE__ << "NOT YET IMPLEMENTED";
return "";
}
}
}
@@ -202,6 +187,67 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
}
CalcState Calculator::isParkingAllowed(Configuration const *cfg, QDateTime const &start) {
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
if (paymentMethodId == PaymentMethod::Steps) {
int const weekdayId = start.date().dayOfWeek();
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
if (businessHours == BusinessHours::OnlyWeekDays) {
if (weekdayId != (int)Qt::Saturday && weekdayId != (int)Qt::Sunday) { // e.g. Neuhauser, Linsinger Maschinenbau (741)
if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
for (WTIterator itr = p.first; itr != p.second; ++itr) {
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
QTime const &startTime = start.time();
if (from > startTime) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 < %2").arg(from.toString(Qt::ISODate))
.arg(startTime.toString(Qt::ISODate)), from, until);
} else
if (startTime >= until) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 >= %2").arg(startTime.toString(Qt::ISODate))
.arg(until.toString(Qt::ISODate)), from, until);
}
return CalcState(CalcState::State::SUCCESS,
"PARKING ALLOWED", from, until);
}
}
}
} else
if (businessHours == BusinessHours::AllDaysWithRestrictedHours) { // e.g. for Neuhauser, NAZ (744)
if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
for (WTIterator itr = p.first; itr != p.second; ++itr) {
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
QTime const &startTime = start.time();
if (from > startTime) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 < %2").arg(from.toString(Qt::ISODate))
.arg(startTime.toString(Qt::ISODate)), from, until);
} else
if (startTime >= until) {
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
QString("%1 >= %2").arg(startTime.toString(Qt::ISODate))
.arg(until.toString(Qt::ISODate)), from, until);
}
return CalcState(CalcState::State::SUCCESS,
"PARKING ALLOWED", from, until);
}
}
}
}
return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, "UNKNOWN ERROR",
QTime(), QTime());
}
///////////////////////////////////////
@@ -225,23 +271,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
} else {
if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
if (!prepaid) {
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
if (businessHours == BusinessHours::OnlyWeekDays) {
int const weekdayId = start_datetime.date().dayOfWeek();
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
for (WTIterator itr = p.first; itr != p.second; ++itr) {
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
QTime const &startTime = start_datetime.time();
if (from <= startTime && startTime <= until) {
end_datetime = start_datetime.addSecs(durationMinutes*60);
return GetCostFromDuration(cfg, start_datetime, end_datetime);
}
}
CalcState cs = isParkingAllowed(cfg, start_datetime);
if (cs) {
end_datetime = start_datetime.addSecs(durationMinutes*60);
double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
end_datetime = start_datetime;
end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
return cost;
}
}
@@ -638,13 +674,24 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
// Check prepaid
if (!prepaid) {
if ((current.time() < worktime_from) || (current.time() > worktime_to)) {
qDebug() << "[STOP] * Ticket is not valid * ";
if (current.time() < worktime_from) {
qDebug() << "[STOP] TICKET IS NOT VALID: "
<< QString("%1 (current) < %2 (start)")
.arg(current.toString(Qt::ISODate)
.arg(worktime_from.toString(Qt::ISODate)));
return Ticket();
} else
if (current.time() > worktime_to) {
qDebug() << "[STOP] TICKET IS NOT VALID: "
<< QString("%1 (current) > %2 (end)")
.arg(current.toString(Qt::ISODate)
.arg(worktime_to.toString(Qt::ISODate)));
return Ticket();
}
} else {
qDebug() << "* PREPAID MODE ACTIVE *";
if (current.time() < worktime_from) {
qDebug() << "*** PREPAID *** Current time is before time range start, fast-forward to start"
<< worktime_from.toString(Qt::ISODate);
current.setTime(worktime_from);
end = current;
} else if(current.time() > lastWorktimeTo) {
@@ -660,10 +707,16 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
if (!IsYearPeriodActive(cfg, current)) {
return Ticket();
}
if(durationMinutesNetto > maxParkingTimeMinutes) {
durationMinutesNetto = maxParkingTimeMinutes;
break;
}
// if(durationMinutesNetto >= maxParkingTimeMinutes) {
// might be useful for overpayment
// durationMinutesNetto = maxParkingTimeMinutes;
// int durationMinutesBrutto = start.secsTo(end) / 60;
//
// return
// Ticket(start, end, durationMinutesNetto,
// durationMinutesBrutto, cost, Ticket::s[INVALID_PRICE]);
//
// }
if(current.time() >= lastWorktimeTo) {
// Go to next day if minutes not spent
if (carryOverNotSet) {
@@ -675,11 +728,20 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
} else {
if(current.time() < worktime_to) {
// Increment input date minutes for each monetary unit
durationMinutesNetto +=1;
durationMinutesNetto += 1;
moneyLeft -= price;
moneyLeft = std::round(moneyLeft * 1000.0) / 1000.0;
current = current.addSecs(60);
end = current;
//qCritical() << "moneyLeft" << moneyLeft
// << "durationMinutesNetto" << durationMinutesNetto
// << "current" << current.toString(Qt::ISODate);
if(durationMinutesNetto <= maxParkingTimeMinutes) {
// stop updating of end-date if parking time is
// overshot
end = current;
}
} else break;
}
} // while(durationMinutes > 0) {
@@ -687,7 +749,7 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
} // for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
} // for (current = start; durationMinutes > 0; current = current.addDays(1)) {
int durationMinutesBrutto = start.secsTo(end) / 60;
int durationMinutesBrutto = start.secsTo(end) / 60;
//qCritical() << "start" << start.toString(Qt::ISODate) << "end"
// << end.toString(Qt::ISODate) << durationMinutesBrutto;
@@ -697,19 +759,102 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
cost, Ticket::s[VALID]);
}
QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
return QList<int>();
}
QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
QList<int> timeSteps;
int const pop_id = cfg->getPaymentOptions().pop_id;
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{
int const durationId = itr->second.pra_payment_unit_id;
int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
timeSteps << durationUnit;
if (m_timeSteps.size() > 0) {
//qCritical() << __PRETTY_FUNCTION__ << "timeSteps:" << m_timeSteps;
return m_timeSteps;
}
return timeSteps;
QDateTime start = QDateTime::currentDateTime();
start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
int const pop_id = cfg->getPaymentOptions().pop_id;
int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
qCritical() << __func__ << ":" << __LINE__ << " start parking time:" << start.toString(Qt::ISODate);
qCritical() << __func__ << ":" << __LINE__ << " payment option id:" << pop_id;
qCritical() << __func__ << ":" << __LINE__ << "payment option carry over:" << pop_carry_over;
if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
//qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
uint16_t timeStepCompensation = 0;
if (pop_carry_over) {
int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const durationId = itr->second.pra_payment_unit_id;
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
ATBDuration duration = search->second;
if (durationId == 1) {
QDateTime carryOver = start;
carryOver = carryOver.addDays(1);
carryOver.setTime(QTime(0, 0, 0));
int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
qCritical()
<< QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
.arg(timeStep).arg(duration.pun_duration_min)
.arg(timeStep).arg(duration.pun_duration_max);
break;
}
qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
// set dynamic minimal parking time
cfg->getPaymentOptions().pop_min_time = timeStep;
qCritical() << __PRETTY_FUNCTION__ << " computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
duration.pun_duration = timeStep;
timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
m_timeSteps << duration.pun_duration;
} else {
duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
m_timeSteps << duration.pun_duration;;
}
cfg->Duration.erase(search);
cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
} else { // if (search != cfg->Duration.end()) {
// TODO
}
}
} else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
// TODO
}
} else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
// TODO
}
} else { // if (pop_carry_over) {
// TODO
}
} else {
qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{
int const durationId = itr->second.pra_payment_unit_id;
int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
m_timeSteps << durationUnit;
}
}
qCritical() << __PRETTY_FUNCTION__ << "NEW timeSteps:" << m_timeSteps;
return m_timeSteps;
}
uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const {
@@ -755,3 +900,120 @@ uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
return duration;
}
std::optional<struct price_t>
Calculator::GetDailyTicketPrice(Configuration* cfg,
QDateTime const &startDatetime,
QDateTime &endTime,
PERMIT_TYPE permitType) {
struct price_t price;
std::optional<struct price_t> value;
std::optional<ATBWeekDaysWorktime> workTime =
cfg->getWeekDayWorkTime(startDatetime.time(),
(Qt::DayOfWeek)startDatetime.date().dayOfWeek());
if (workTime) {
ATBWeekDaysWorktime const &wt = workTime.value();
endTime = startDatetime;
endTime.setTime(QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate));
std::optional<QVector<ATBDailyTicket>> dailyTickets = cfg->getDailyTicketsForAllKeys();
if (dailyTickets) {
QVector<ATBDailyTicket> const tickets = dailyTickets.value();
switch (permitType) {
case PERMIT_TYPE::DAY_TICKET_ADULT: {
std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::ADULT);
if (c) {
for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
int priceId = tickets[i].daily_ticket_price_id;
QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
int const pop_id = paymentOptions.at(j).pop_id;
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
if (paymentRates) {
QVector<ATBPaymentRate> const &pr = paymentRates.value();
for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
if (pr.at(k).pra_payment_option_id == pop_id) {
if (priceId == pr.at(k).pra_payment_unit_id) {
price.netto = pr.at(k).pra_price;
value = value.value_or(price);
}
}
}
}
}
}
}
}
} break;
case PERMIT_TYPE::DAY_TICKET_TEEN: {
std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::TEEN);
if (c) {
for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
int priceId = tickets[i].daily_ticket_price_id;
QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
int const pop_id = paymentOptions.at(j).pop_id;
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
if (paymentRates) {
QVector<ATBPaymentRate> const &pr = paymentRates.value();
for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
if (pr.at(k).pra_payment_option_id == pop_id) {
if (priceId == pr.at(k).pra_payment_unit_id) {
price.netto = pr.at(k).pra_price;
value = value.value_or(price);
}
}
}
}
}
}
}
}
} break;
case PERMIT_TYPE::DAY_TICKET_CHILD: {
std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::CHILD);
if (c) {
for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
int priceId = tickets[i].daily_ticket_price_id;
QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
int const pop_id = paymentOptions.at(j).pop_id;
std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
if (paymentRates) {
QVector<ATBPaymentRate> const &pr = paymentRates.value();
for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
if (pr.at(k).pra_payment_option_id == pop_id) {
if (priceId == pr.at(k).pra_payment_unit_id) {
price.netto = pr.at(k).pra_price;
value = value.value_or(price);
}
}
}
}
}
}
}
}
}
// [[fallthrough]];
case PERMIT_TYPE::SHORT_TERM_PARKING: {
}
// [[fallthrough]];
case PERMIT_TYPE::DAY_TICKET: {
}
// [[fallthrough]];
case PERMIT_TYPE::SZEGED_START:
// [[fallthrough]];
case PERMIT_TYPE::SZEGED_STOP:
// [[fallthrough]];
case PERMIT_TYPE::INVALID:
break;
}
}
}
return value;
}

View File

@@ -1,4 +1,10 @@
#include "configuration.h"
#include "tariff_timebase.h"
#include "time_range_header.h"
#include "tariff_timestep_config.h"
#include <QString>
#include <QDebug>
/// <inheritdoc/>
MemberType Configuration::IdentifyJsonMember(const char* member_name)
@@ -13,7 +19,12 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
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;
else return MemberType::UnknownType;
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;
if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType;
if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType;
else return MemberType::UnknownType;
}
/// <inheritdoc/>
@@ -68,17 +79,23 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
}
printf("%s", "Valid JSON configuration identified\n");
ATBCurrency Currency;
ATBDuration Duration;
ATBPaymentMethod PaymentMethod;
ATBPaymentRate PaymentRate;
ATBSpecialDaysWorktime SpecialDaysWorktime;
ATBSpecialDays SpecialDays;
ATBWeekDays WeekDays;
ATBWeekDaysWorktime WeekDaysWorktime;
ATBPaymentOption PaymentOption;
ATBPeriodYear YearPeriod;
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;
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)
@@ -109,14 +126,14 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
continue;
}
//printf(" -%s\n", mb_name);
printf(" -%s\n", mb_name);
// 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 (auto j = 0; j < mb_array.Size(); j++)
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();
@@ -136,12 +153,157 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
// Identify member type
mb_type = IdentifyJsonMember(mb_name);
//#pragma region Get_values
switch (mb_type)
{
case MemberType::UnknownType:
break;
case MemberType::CurrencyType:
case MemberType::TimeRangeType:
if (QString(inner_obj_name) == QString("time_range_id")) {
if (k->value.IsInt()) {
TimeRange.time_range_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("time_range_from")) {
if (k->value.IsString()) {
QTime timeRangeFrom = QTime::fromString(QString::fromStdString(k->value.GetString()), Qt::ISODate);
TimeRange.time_range_from = timeRangeFrom;
}
} else
if (QString(inner_obj_name) == QString("time_range_to")) {
if (k->value.IsString()) {
QTime timeRangeTo = QTime::fromString(QString::fromStdString(k->value.GetString()), Qt::ISODate);
TimeRange.time_range_to = timeRangeTo;
}
}
break;
case MemberType::TimeBaseType:
if (QString(inner_obj_name) == QString("tbase_id")) {
if (k->value.IsInt()) {
TimeBase.tbase_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("tbase_type")) {
if (k->value.IsInt()) {
int timeBase = k->value.GetInt();
switch (timeBase) {
case (int)ATBTimeBase::TimeBaseType::ABSOLUTE:
TimeBase.tbase_type = ATBTimeBase::TimeBaseType::ABSOLUTE;
break;
case (int)ATBTimeBase::TimeBaseType::RELATIVE:
TimeBase.tbase_type = ATBTimeBase::TimeBaseType::RELATIVE;
break;
}
}
}
break;
case MemberType::TimeStepConfigType:
if (QString(inner_obj_name) == QString("tsconfig_id")) {
if (k->value.IsInt()) {
TimeStepConfig.tsconfig_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("tsconfig_label")) {
if (k->value.IsString()) {
TimeStepConfig.tsconfig_label = QString::fromStdString(k->value.GetString());
}
}
break;
case MemberType::DailyTicketType:
if (QString(inner_obj_name) == QString("daily_ticket_payment_option_id")) {
if (k->value.IsInt()) {
DailyTicket.daily_ticket_payment_option_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_id")) {
if (k->value.IsInt()) {
DailyTicket.daily_ticket_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_price_id")) {
if (k->value.IsInt()) {
DailyTicket.daily_ticket_price_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_tb_id")) {
if (k->value.IsInt()) {
DailyTicket.daily_ticket_tb_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_clearance_customer_ids")) {
if (k->value.IsArray()) {
auto customerIds = k->value.GetArray();
for (rapidjson::SizeType i=0; i < customerIds.Size(); ++i) {
if (customerIds[i].IsInt()) {
DailyTicket.daily_ticket_clearance_customer_ids.append(customerIds[i].GetInt());
}
}
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_from_min")) {
if (k->value.IsString()) {
std::string const from_min = k->value.GetString();
char const *from_min_c_str = from_min.c_str(); // for debugging
DailyTicket.daily_ticket_from_min = QTime::fromString(from_min_c_str, Qt::ISODate);
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_to_max")) {
if (k->value.IsString()) {
std::string const to_max = k->value.GetString();
char const *to_max_c_str = to_max.c_str();
DailyTicket.daily_ticket_to_max = QTime::fromString(to_max_c_str, Qt::ISODate);
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_from_offset_min")) {
if (k->value.IsInt()) {
int const from_offset_min = k->value.GetInt();
DailyTicket.daily_ticket_from_offset_min = from_offset_min;
}
} else
if (QString(inner_obj_name) == QString("daily_ticket_to_offset_max")) {
if (k->value.IsInt()) {
int to_offset_max = k->value.GetInt();
DailyTicket.daily_ticket_to_offset_max = to_offset_max;
}
}
break;
case MemberType::CustomerType:
if (QString(inner_obj_name) == QString("cust_id")) {
if (k->value.IsInt()) {
Customer.cust_id = k->value.GetInt();
}
} else
if (QString(inner_obj_name) == QString("cust_type")) {
if (k->value.IsInt()) {
int cust_type = k->value.GetInt();
switch (cust_type) {
case (int)ATBCustomer::CustomerType::ADULT:
Customer.cust_type = ATBCustomer::CustomerType::ADULT;
break;
case (int)ATBCustomer::CustomerType::CHILD:
Customer.cust_type = ATBCustomer::CustomerType::CHILD;
break;
case (int)ATBCustomer::CustomerType::TEEN:
Customer.cust_type = ATBCustomer::CustomerType::TEEN;
break;
}
}
} else
if (QString(inner_obj_name) == QString("cust_label")) {
if (k->value.IsString()) {
QString label(QString::fromStdString(k->value.GetString()));
if (label.contains("ADULT", Qt::CaseInsensitive)) {
Customer.cust_label = label;
} else
if (label.contains("CHILD", Qt::CaseInsensitive)) {
Customer.cust_label = label;
} else
if (label.contains("TEEN", Qt::CaseInsensitive)) {
Customer.cust_label = label;
}
}
}
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();
@@ -158,25 +320,45 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
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) PaymentOption.pop_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pop_label") == 0) PaymentOption.pop_label = k->value.GetString();
else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) PaymentOption.pop_payment_method_id = k->value.GetInt();
else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) PaymentOption.pop_day_end_time = k->value.GetString();
else if (strcmp(inner_obj_name, "pop_day_night_end_time") == 0) PaymentOption.pop_day_night_end_time = k->value.GetString();
else if (strcmp(inner_obj_name, "pop_price_night") == 0) PaymentOption.pop_price_night = k->value.GetDouble();
else if (strcmp(inner_obj_name, "pop_min_time") == 0) PaymentOption.pop_min_time = k->value.GetDouble();
else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
else if (strcmp(inner_obj_name, "pop_business_hours") == 0) PaymentOption.pop_business_hours = k->value.GetInt();
this->currentPaymentOptions = PaymentOption;
if (strcmp(inner_obj_name, "pop_id") == 0) {
this->currentPaymentOptions.append(ATBPaymentOption());
this->currentPaymentOptions.last().reset();
this->currentPaymentOptions.last().pop_id = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_label") == 0) {
this->currentPaymentOptions.last().pop_label = k->value.GetString();
} else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) {
this->currentPaymentOptions.last().pop_payment_method_id = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) {
this->currentPaymentOptions.last().pop_day_end_time = k->value.GetString();
} else if (strcmp(inner_obj_name, "pop_day_night_end_time") == 0) {
this->currentPaymentOptions.last().pop_day_night_end_time = k->value.GetString();
} else if (strcmp(inner_obj_name, "pop_price_night") == 0) {
this->currentPaymentOptions.last().pop_price_night = k->value.GetDouble();
} else if (strcmp(inner_obj_name, "pop_min_time") == 0) {
this->currentPaymentOptions.last().pop_min_time = k->value.GetDouble();
} else if (strcmp(inner_obj_name, "pop_max_time") == 0) {
this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
} else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
} else if (strcmp(inner_obj_name, "pop_carry_over") == 0) {
this->currentPaymentOptions.last().pop_carry_over = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_carry_over_time_range_id") == 0) {
this->currentPaymentOptions.last().pop_carry_over_time_range_id = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) {
this->currentPaymentOptions.last().pop_daily_card_price = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_business_hours") == 0) {
this->currentPaymentOptions.last().pop_business_hours = k->value.GetInt();
} else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) {
this->currentPaymentOptions.last().pop_time_step_config = k->value.GetInt();
}
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();
break;
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();
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();
@@ -194,7 +376,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
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();
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();
@@ -225,12 +408,16 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
case MemberType::PaymentMethodType:
cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
break;
case MemberType::PaymentRateType:
case MemberType::PaymentRateType:
// qCritical() << "PaymentRate" << PaymentRate;
cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
break;
case MemberType::PaymentOptionType:
cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
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:
cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
break;
@@ -249,7 +436,28 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
case MemberType::PeriodYearType:
cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
break;
default:
case MemberType::DailyTicketType:
cfg->DailyTicket.insert(pair<int, ATBDailyTicket>(DailyTicket.daily_ticket_id, DailyTicket));
qCritical() << DailyTicket;
DailyTicket.reset();
break;
case MemberType::CustomerType:
cfg->Customer.insert(pair<int, ATBCustomer>(Customer.cust_id, Customer));
qCritical() << Customer;
break;
case MemberType::TimeBaseType:
cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
qCritical() << TimeBase;
break;
case MemberType::TimeRangeType:
cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
// qCritical() << TimeRange;
break;
case MemberType::TimeStepConfigType:
cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
// qCritical() << TimeStepConfig;
break;
default:
break;
}
}
@@ -262,9 +470,123 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
}
}
ATBPaymentOption const &Configuration::getPaymentOptions() const {
Q_ASSERT(!this->currentPaymentOptions.isEmpty());
return this->currentPaymentOptions.at(0);
}
ATBPaymentOption &Configuration::getPaymentOptions() {
Q_ASSERT(!this->currentPaymentOptions.isEmpty());
return this->currentPaymentOptions[0];
}
const ATBPaymentOption & Configuration::getPaymentOptions()
{
QVector<ATBPaymentOption> const &Configuration::getAllPaymentOptions() const {
return this->currentPaymentOptions;
}
QVector<ATBPaymentOption> &Configuration::getAllPaymentOptions() {
return this->currentPaymentOptions;
}
std::optional<QVector<ATBDailyTicket>>
Configuration::getDailyTicketsForAllKeys() const {
QVector<ATBDailyTicket> tickets;
std::optional<QVector<ATBDailyTicket>> value;
for (std::multimap<int, ATBDailyTicket>::const_iterator it = this->DailyTicket.cbegin();
it != this->DailyTicket.cend(); ++it) {
tickets.append(it->second);
}
if (tickets.size() > 0) {
value = value.value_or(tickets);
}
return value;
}
std::optional<QVector<ATBDailyTicket>>
Configuration::getDailyTicketsForKey(int key) const {
QVector<ATBDailyTicket> tickets;
std::optional<QVector<ATBDailyTicket>> value;
tickets.clear();
for (auto[it, rangeEnd] = this->DailyTicket.equal_range(key); it != rangeEnd; ++it) {
tickets.append(it->second);
}
if (tickets.size() > 0) {
value = value.value_or(tickets);
}
return value;
}
std::optional<QVector<ATBPaymentRate>>
Configuration::getPaymentRateForAllKeys() const {
QVector<ATBPaymentRate> paymentRates;
std::optional<QVector<ATBPaymentRate>> value;
for (std::multimap<int, ATBPaymentRate>::const_iterator it = this->PaymentRate.cbegin();
it != this->PaymentRate.cend(); ++it) {
paymentRates.append(it->second);
}
if (paymentRates.size() > 0) {
value = value.value_or(paymentRates);
}
return value;
}
std::optional<QVector<ATBPaymentRate>>
Configuration::getPaymentRateForKey(int key) const {
QVector<ATBPaymentRate> paymentRate;
std::optional<QVector<ATBPaymentRate>> value;
paymentRate.clear();
for (auto[it, rangeEnd] = this->PaymentRate.equal_range(key); it != rangeEnd; ++it) {
paymentRate.append(it->second);
}
if (paymentRate.size() > 0) {
value = value.value_or(paymentRate);
}
return value;
}
std::optional<ATBCustomer>
Configuration::getCustomerForType(ATBCustomer::CustomerType customerType) {
for (std::multimap<int, ATBCustomer>::const_iterator it = this->Customer.cbegin();
it != this->Customer.cend(); ++it) {
ATBCustomer const &customer = it->second;
if (customer.cust_type == customerType) {
return customer;
}
}
return std::nullopt;
}
std::optional<ATBWeekDaysWorktime>
Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
ATBWeekDaysWorktime worktime;
std::optional<ATBWeekDaysWorktime> value;
std::multimap<int, ATBWeekDaysWorktime>::const_iterator it = this->WeekDaysWorktime.find((int)dayOfWeek);
if (it != this->WeekDaysWorktime.cend()) {
ATBWeekDaysWorktime const &wt = it->second;
if (time >= QTime::fromString(wt.pwd_time_from.c_str(), Qt::ISODate)
&& time < QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate)) {
value = value.value_or(wt);
}
}
return value;
}

View File

@@ -4,7 +4,7 @@
#include <QDebug>
#include <algorithm>
static int protection_counter = 0;
// static int protection_counter = 0;
/// <summary>
/// Helper function
@@ -354,22 +354,24 @@ bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymen
}
PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
if (cfg->PaymentOption.size() != 1) {
if (cfg->PaymentOption.size() == 0) {
return PaymentMethod::Undefined;
}
std::multimap<int, ATBPaymentOption>::const_iterator it =
cfg->PaymentOption.cbegin();
switch (it->first) {
case PaymentMethod::Linear:
return PaymentMethod::Linear;
case PaymentMethod::Steps:
return PaymentMethod::Steps;
case PaymentMethod::Degressive:
return PaymentMethod::Degressive;
case PaymentMethod::Progressive:
return PaymentMethod::Progressive;
if (it != cfg->PaymentOption.cend()) {
switch (it->first) {
case PaymentMethod::Linear:
return PaymentMethod::Linear;
case PaymentMethod::Steps:
return PaymentMethod::Steps;
case PaymentMethod::Degressive:
return PaymentMethod::Degressive;
case PaymentMethod::Progressive:
return PaymentMethod::Progressive;
}
}
return PaymentMethod::Undefined;
@@ -403,18 +405,22 @@ uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod
BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) {
int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours;
qCritical() << __func__ << ":" << __LINE__ << businessHours;
switch (businessHours) {
case NoRestriction_24_7: return NoRestriction_24_7;
case OnlyWorkingDays: return OnlyWorkingDays;
case OnlyWeekDays: return OnlyWeekDays;
case OnlyWeekEnd: return OnlyWeekEnd;
case OnlyOfficialHolidays: return OnlyOfficialHolidays;
case OnlySpecialDays: return OnlySpecialDays;
case OnlySchoolHolidays: return OnlySchoolHolidays;
case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays;
case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays;
case NoRestriction_24_7: return BusinessHours::NoRestriction_24_7;
case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays;
case OnlyWeekDays: return BusinessHours::OnlyWeekDays;
case OnlyWeekEnd: return BusinessHours::OnlyWeekEnd;
case OnlyOfficialHolidays: return BusinessHours::OnlyOfficialHolidays;
case OnlySpecialDays: return BusinessHours::OnlySpecialDays;
case OnlySchoolHolidays: return BusinessHours::OnlySchoolHolidays;
case SpecialAndSchoolHolidays: return BusinessHours::SpecialAndSchoolHolidays;
case OnlyOpenForBusinessDays: return BusinessHours::OnlyOpenForBusinessDays;
case AllDaysWithRestrictedHours: return BusinessHours::AllDaysWithRestrictedHours;
}
return NoBusinessHoursDefined;
return BusinessHours::NoBusinessHoursDefined;
}
uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {

View File

@@ -31,22 +31,140 @@ extern "C" char* strptime(const char* s,
#include <fstream>
#include <sstream>
#include "calculator_functions.h"
#include <calculate_price.h>
#include "calculate_price.h"
#define SZEGED (0)
#define NEUHAUSER_KORNEUBURG (0)
#define NEUHAUSER_LINSINGER_MASCHINENBAU (1)
#define SZEGED (0)
#define SCHOENAU_KOENIGSEE (0)
#define NEUHAUSER_KORNEUBURG (0)
#define NEUHAUSER_LINSINGER_MASCHINENBAU (0)
#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
#define NEUHAUSER_BILEXA_GALTUER (1)
int main() {
#if NEUHAUSER_LINSINGER_MASCHINENBAU==1
std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json");
#if SCHOENAU_KOENIGSEE==1
QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff01.json");
//QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff02.json");
std::ifstream input(f.toUtf8().constData());
std::stringstream sstr;
while(input >> sstr.rdbuf());
std::string json(sstr.str());
Configuration cfg;
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
cout << endl;
if (isParsed) {
qCritical() << "parsed" << f;
int minParkingTime = get_minimal_parkingtime(&cfg);
qCritical() << "minimal_parking_time" << minParkingTime;
QDateTime start = QDateTime::currentDateTime();
// zone 1
//int timeSteps[9] = {60, 180, 1440, 2880, 4320, 5670, 7200, 8640, 10080};
// zone 2
//int timeSteps[3] = {60, 180, 1440};
static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
qCritical() << "TimeSteps" << timeSteps;
// for (int i = 0 ; i < timeSteps.size(); ++i) {
// QDateTime end = start.addSecs(timeSteps.at(i)*60);
//
// double price = Calculator::GetInstance().GetCostFromDuration(
// &cfg,
// start,
// timeSteps.at(i));
// qDebug() << "GetCostFromDuration() time: " << timeSteps.at(i) << "price=" << price;
//}
}
#endif
#if NEUHAUSER_BILEXA_GALTUER==1
std::ifstream input("/opt/ptu5/opt/customer_745/etc/psa_tariff/tariff01.json");
std::stringstream sstr;
while(input >> sstr.rdbuf());
std::string json(sstr.str());
Configuration cfg;
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
cout << endl;
if (isParsed) {
int minParkingTime = get_minimal_parkingtime(&cfg);
QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
qCritical() << timeSteps;
int Down = 0;
int Up = 1;
//compute_next_timestep(&cfg, )
for (int i=0; i<timeSteps.size(); ++i) {
int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
qCritical() << "nextTimeStep" << nextTimeStep;
// uint32_t price = calculator.GetPriceForTimeStep(&cfg, timeSteps.at(i));
// uint32_t duration = calculator.GetDurationForPrice(&cfg, price);
// qCritical() << "nextTimeStep relative to start:"
// << duration << start.addSecs(duration * 60)
// << "(price so far:" << price << ")";
}
}
#endif
#if NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM==1
std::ifstream input("/opt/ptu5/opt/customer_744/etc/psa_tariff/tariff01.json");
std::stringstream sstr;
while(input >> sstr.rdbuf());
std::string json(sstr.str());
Configuration cfg;
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
cout << endl;
if (isParsed) {
QDateTime s(QDate(2023, 11, 30), QTime());
QDateTime end;
struct price_t price;
for (int offset = 480; offset < 1080; ++offset) {
QDateTime start = s.addSecs(offset * 60);
// qCritical() << QString(Calculator::GetInstance().isParkingAllowed(&cfg, start));
CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
PERMIT_TYPE::DAY_TICKET_ADULT, &price);
qCritical() << "start=" << start.toString(Qt::ISODate)
<< "end" << end.toString(Qt::ISODate) << "price" << price.netto;
}
for (int offset = 480; offset < 1080; ++offset) {
QDateTime start = s.addSecs(offset * 60);
CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
PERMIT_TYPE::DAY_TICKET_TEEN, &price);
qCritical() << "start=" << start.toString(Qt::ISODate)
<< "end" << end.toString(Qt::ISODate) << "price" << price.netto;
}
}
#endif
#if NEUHAUSER_LINSINGER_MASCHINENBAU==1
std::ifstream input("/opt/ptu5/opt/customer_741/etc/psa_tariff/tariff01.json");
std::stringstream sstr;
while(input >> sstr.rdbuf());
std::string json(sstr.str());
Calculator calculator;
Configuration cfg;
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
@@ -65,17 +183,17 @@ int main() {
QDateTime start = s.addSecs(offset * 60);
//qCritical() << "start" << start.toString(Qt::ISODate);
double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
//qCritical() << "";
//qCritical() << "start" << start.toString(Qt::ISODate)
// << "end" << end.toString(Qt::ISODate)
// << "duration" << marken[duration]
// << "cost" << cost;
std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
qCritical() << "start" << start.toString(Qt::ISODate)
<< "cost" << cost
<< "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;
<< "end" << end.toString(Qt::ISODate)
<< "duration" << marken[duration]
<< "cost" << cost;
//std::string d = Calculator::GetInstance().GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
//qCritical() << "start" << start.toString(Qt::ISODate)
// << "cost" << cost
// << "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;
}
}
}
@@ -132,33 +250,37 @@ int main() {
#elif SZEGED==1
std::ifstream input;
int pop_min_time;
int pop_max_time;
int pop_min_price;
int pop_max_price;
for (int t=6; t < 7; t+=20) {
for (int t=1; t < 2; ++t) {
//for (int t=6; t < 7; t+=20) {
switch (t) {
case 1: {
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff01.json");
pop_max_time = 6*60;
//pop_max_time = 6*60;
} break;
case 2: {
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff02.json");
pop_max_time = 5*60;
//pop_max_time = 5*60;
} break;
case 3: {
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff03.json");
pop_max_time = 6*60;
//pop_max_time = 6*60;
} break;
case 4: {
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff04.json");
pop_max_time = 4*60;
//pop_max_time = 4*60;
} break;
case 5: {
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff05.json");
pop_max_time = 6*60;
//pop_max_time = 6*60;
} break;
case 6: {
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff06.json");
pop_max_time = 4*60;
//pop_max_time = 4*60;
} break;
default:
continue;
@@ -167,52 +289,83 @@ int main() {
while(input >> sstr.rdbuf());
std::string json(sstr.str());
Calculator calculator;
Configuration cfg;
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
cout << endl;
if (isParsed) {
// test library functions
pop_min_time = get_minimal_parkingtime(&cfg);
pop_max_time = get_maximal_parkingtime(&cfg);
pop_min_price = get_minimal_parkingprice(&cfg);
pop_max_price = get_maximal_parkingprice(&cfg);
qCritical() << " pop_min_time: " << pop_min_time;
qCritical() << " pop_max_time: " << pop_max_time;
qCritical() << " pop_min_price: " << pop_min_price;
qCritical() << " pop_max_price: " << pop_max_price;
qCritical() << "pop_daily_card_price: " << cfg.getPaymentOptions().pop_daily_card_price;
{
// zone 1 (lila)
QDateTime s(QDate(2023, 11, 30), QTime());
QDateTime end;
int cnt = 1;
#if 0
for (int duration = 15; duration <= pop_max_time; duration += 5) {
for (int offset = 480; offset < 1080; ++offset) {
QDateTime start = s.addSecs(offset * 60);
//qCritical() << "start" << start.toString(Qt::ISODate);
// qCritical() << "start" << start.toString(Qt::ISODate);
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration);
//Q_ASSERT(cost == duration*2.5);
double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration);
// Q_ASSERT(cost == duration*2.5);
//qCritical() << "";
//qCritical() << "start" << start.toString(Qt::ISODate)
// << "end" << end.toString(Qt::ISODate)
// << "duration" << duration
// << "cost" << cost;
qCritical() << cnt << "start" << start.toString(Qt::ISODate)
<< "end" << end.toString(Qt::ISODate)
<< "duration" << duration
<< "cost" << cost;
std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg,
3,
start.toString(Qt::ISODate).toStdString().c_str(),
cost, false, true);
//Q_ASSERT(cost == duration*2.5);
qCritical() << "start" << start.toString(Qt::ISODate)
qCritical() << cnt << "start" << start.toString(Qt::ISODate)
<< "cost" << cost
<< "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
++cnt;
}
}
#else
QDateTime start = s.addSecs(480 * 60); // 8:00:00
double cost = 2000;
std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg,
3,
start.toString(Qt::ISODate).toStdString().c_str(),
cost, false, true);
qCritical() << cnt << "start" << start.toString(Qt::ISODate)
<< "cost" << cost
<< "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
#endif
}
#if 0
{
QDateTime start(QDate(2023, 12, 1), QTime(18, 0));
QDateTime end;
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, 60);
// Q_ASSERT(cost == 150);
qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
}
{
QDateTime start(QDate(2023, 10, 31), QTime(18, 0));
QDateTime end;
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, 60);
//Q_ASSERT(cost == 150);
qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
}
#endif
}
}

View File

@@ -3,8 +3,8 @@ TARGET = main
CONFIG += -std=c++11
QMAKE_CFLAGS = -c -pipe -std=c11 -g -O0 -Wall -Wno-attributes -W -DDEBUG -D_REENTRANT -fPIC
QMAKE_CXX_FLAGS += -std=c11
QMAKE_CFLAGS = -c -pipe -std=c11 -g -O -Wall -Wno-attributes -W -DDEBUG -D_REENTRANT -fPIC
QMAKE_CXXFLAGS += -std=c++17 -g -O
INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/mobilisis/
INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/rapidjson/

View File

@@ -0,0 +1,172 @@
{
"Project" : "Bilexa Galtuer",
"Version" : "1.0.0",
"Info" : "",
"Currency": [
{
"pcu_id": 1,
"pcu_sign": "€",
"pcu_major": "Euro",
"pcu_minor": "Cent",
"pcu_active": true
}
],
"TimeStepConfig" : [
{
"tsconfig_id" : 1,
"tsconfig_label" : "static",
"tsconfig_comment" : "read time steps as given in jsonfiles"
},
{
"tsconfig_id" : 2,
"tsconfig_label" : "dynamic",
"tsconfig_comment" : "determine timesteps at runtime"
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"PaymentOption": [
{
"pop_id": 1099,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_min_time": 1,
"pop_max_time": 10080,
"pop_min_price": 700,
"pop_carry_over": 1,
"pop_carry_over_time_range_id": 1,
"pop_daily_card_price": 0,
"pop_business_hours": 0,
"pop_time_step_config": 2
}
],
"TimeBase": [
{
"tbase_id": 0,
"tbase_type": 0,
"tbase_type_comment": "time is given as starting from some wall-clock-time",
"tbase_label": "absolute time"
},
{
"tbase_id": 1,
"tbase_type": 1,
"tbase_type_comment": "time is given as starting from 0 minutes",
"tbase_label": "relative time"
}
],
"TimeRange" : [
{
"time_range_id": 1,
"time_range_from": "00:00:00",
"time_range_to": "00:01:00",
"time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 1,
"pra_price": 700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 2,
"pra_price": 1400
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 3,
"pra_price": 2100
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 4,
"pra_price": 2800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 5,
"pra_price": 3500
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 6,
"pra_price": 4200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 7,
"pra_price": 4900
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "Day 1",
"pun_duration_min": 1,
"pun_duration_max": 1440,
"pun_duration": 0
},
{
"pun_id": 2,
"pun_label": "Day 2",
"pun_duration_min": 2880,
"pun_duration_max": 2880,
"pun_duration": 2880
},
{
"pun_id": 3,
"pun_label": "Day 3",
"pun_duration_min": 4320,
"pun_duration_max": 4320,
"pun_duration": 4320
},
{
"pun_id": 4,
"pun_label": "Day 4",
"pun_duration_min": 5760,
"pun_duration_max": 5760,
"pun_duration": 5760
},
{
"pun_id": 5,
"pun_label": "Day 5",
"pun_duration_min": 7200,
"pun_duration_max": 7200,
"pun_duration": 7200
},
{
"pun_id": 6,
"pun_label": "Day 6",
"pun_duration_min": 8640,
"pun_duration_max": 8640,
"pun_duration": 8640
},
{
"pun_id": 7,
"pun_label": "Day 7",
"pun_duration_min": 10080,
"pun_duration_max": 10080,
"pun_duration": 10080
}
]
}

View File

@@ -0,0 +1,629 @@
{
"Project" : "Korneuburg",
"Version" : "1.0.0",
"Info" : "",
"Currency": [
{
"pcu_id": 2,
"pcu_sign": "€",
"pcu_major": "EUR",
"pcu_minor": "",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"PaymentOption": [
{
"pop_id": 1049,
"pop_label": "Zone 1",
"pop_payment_method_id": 3,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_min_time": 30,
"pop_max_time": 180,
"pop_min_price": 60,
"pop_carry_over": 1,
"pop_daily_card_price": 0
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 10
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "5 min",
"pun_duration": 5
},
{
"pun_id": 3,
"pun_label": "15 min",
"pun_duration": 15
},
{
"pun_id": 4,
"pun_label": "1 min",
"pun_duration": 1
}
],
"WeekDaysWorktime": [
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
},
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "14:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "14:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "14:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "14:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "14:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
}
],
"SpecialDaysWorktime": [
{
"pedwt_id": 2156,
"pedwt_period_exc_day_id": 2024,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2158,
"pedwt_period_exc_day_id": 2025,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2160,
"pedwt_period_exc_day_id": 2026,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2162,
"pedwt_period_exc_day_id": 2027,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2164,
"pedwt_period_exc_day_id": 2028,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2170,
"pedwt_period_exc_day_id": 2030,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2172,
"pedwt_period_exc_day_id": 2032,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2174,
"pedwt_period_exc_day_id": 11,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2175,
"pedwt_period_exc_day_id": 13,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2178,
"pedwt_period_exc_day_id": 2022,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2179,
"pedwt_period_exc_day_id": 14,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2184,
"pedwt_period_exc_day_id": 2021,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2188,
"pedwt_period_exc_day_id": 2031,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2189,
"pedwt_period_exc_day_id": 2029,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2194,
"pedwt_period_exc_day_id": 2034,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2200,
"pedwt_period_exc_day_id": 2037,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2202,
"pedwt_period_exc_day_id": 2038,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2226,
"pedwt_period_exc_day_id": 2016,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2245,
"pedwt_period_exc_day_id": 2035,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2246,
"pedwt_period_exc_day_id": 2036,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2249,
"pedwt_period_exc_day_id": 2050,
"pedwt_time_from": "08:00:00",
"pedwt_time_to": "16:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2250,
"pedwt_period_exc_day_id": 2051,
"pedwt_time_from": "08:00:00",
"pedwt_time_to": "16:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2251,
"pedwt_period_exc_day_id": 2052,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2252,
"pedwt_period_exc_day_id": 2053,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2253,
"pedwt_period_exc_day_id": 2054,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2254,
"pedwt_period_exc_day_id": 2055,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2255,
"pedwt_period_exc_day_id": 2056,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2256,
"pedwt_period_exc_day_id": 2057,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2257,
"pedwt_period_exc_day_id": 2058,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2258,
"pedwt_period_exc_day_id": 2059,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2259,
"pedwt_period_exc_day_id": 2060,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
}
],
"SpecialDays": [
{
"ped_id": 11,
"ped_label": "Mariae Empfaengnis",
"ped_date_start": "2023-12-08",
"ped_date_end": "2023-12-08",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 13,
"ped_label": "Christtag",
"ped_date_start": "2023-12-25",
"ped_date_end": "2023-12-25",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 14,
"ped_label": "Stefanitag",
"ped_date_start": "2023-12-26",
"ped_date_end": "2023-12-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2016,
"ped_label": "Neujahr",
"ped_date_start": "2024-01-01",
"ped_date_end": "2024-01-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2021,
"ped_label": "Heilig Drei Koenige",
"ped_date_start": "2024-01-06",
"ped_date_end": "2024-01-06",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2022,
"ped_label": "Ostermontag",
"ped_date_start": "2024-01-04",
"ped_date_end": "2024-01-04",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2024,
"ped_label": "Staatsfeiertag",
"ped_date_start": "2024-05-01",
"ped_date_end": "2024-05-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2025,
"ped_label": "Christi Himmelfahrt",
"ped_date_start": "2024-05-09",
"ped_date_end": "2024-05-09",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2026,
"ped_label": "Pfingst Montag",
"ped_date_start": "2024-05-20",
"ped_date_end": "2024-05-20",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2027,
"ped_label": "Fronleichnam",
"ped_date_start": "2024-05-30",
"ped_date_end": "2024-05-30",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2028,
"ped_label": "Maria Himmelfahrt",
"ped_date_start": "2024-08-15",
"ped_date_end": "2024-08-15",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2029,
"ped_label": "Nationalfeiertag",
"ped_date_start": "2024-10-26",
"ped_date_end": "2024-10-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2030,
"ped_label": "Allerheiligen",
"ped_date_start": "2024-11-01",
"ped_date_end": "2024-11-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2031,
"ped_label": "Mariae Empfaengnis",
"ped_date_start": "2024-08-12",
"ped_date_end": "2024-08-12",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2032,
"ped_label": "Christtag",
"ped_date_start": "2024-12-25",
"ped_date_end": "2024-12-25",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2034,
"ped_label": "Stefanitag",
"ped_date_start": "2024-12-26",
"ped_date_end": "2024-12-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2035,
"ped_label": "Neujahr",
"ped_date_start": "2025-01-01",
"ped_date_end": "2025-01-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2036,
"ped_label": "Heilig Drei Koenige",
"ped_date_start": "2025-06-01",
"ped_date_end": "2025-06-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2037,
"ped_label": "Ostermontag",
"ped_date_start": "2025-04-21",
"ped_date_end": "2025-04-21",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2038,
"ped_label": "Staatsfeiertag",
"ped_date_start": "2025-05-01",
"ped_date_end": "2025-05-01",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2050,
"ped_label": "Christi Himmelfahrt",
"ped_date_start": "2025-05-29",
"ped_date_end": "2025-05-29",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2051,
"ped_label": "Pfingstmontag",
"ped_date_start": "2025-06-09",
"ped_date_end": "2025-06-09",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2052,
"ped_label": "Fronlaeichnam",
"ped_date_start": "2025-06-19",
"ped_date_end": "2025-06-19",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2053,
"ped_label": "Mariae Himmelfahrt",
"ped_date_start": "2025-08-15",
"ped_date_end": "2025-08-15",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2054,
"ped_label": "Nationalfeiertag",
"ped_date_start": "2025-10-26",
"ped_date_end": "2025-10-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2055,
"ped_label": "Allerheiligen",
"ped_date_start": "2025-11-01",
"ped_date_end": "2025-11-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2056,
"ped_label": "Mariae Empfaengnis",
"ped_date_start": "2025-12-08",
"ped_date_end": "2025-12-08",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2057,
"ped_label": "Christtag",
"ped_date_start": "2025-12-25",
"ped_date_end": "2025-12-25",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2058,
"ped_label": "Stefanitag",
"ped_date_start": "2025-12-26",
"ped_date_end": "2025-12-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2059,
"ped_label": "Neujahr",
"ped_date_start": "2026-01-01",
"ped_date_end": "2026-01-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2060,
"ped_label": "Heilige Drei Koenige",
"ped_date_start": "2026-01-06",
"ped_date_end": "2026-01-06",
"ped_period_special_day_id": 1,
"ped_year": 0
}
],
"PeriodYear": [
{
"pye_id": 8,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
}
]
}

View File

@@ -0,0 +1,598 @@
{
"Project" : "Linsinger Maschinenbau",
"Version" : "1.0.0",
"Info" : "",
"Currency": [
{
"pcu_id": 1,
"pcu_sign": "€",
"pcu_major": "EUR",
"pcu_minor": "",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"PaymentOption": [
{
"pop_id": 1049,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "00:00:00",
"pop_day_night_end_time": "00:00:00",
"pop_price_night": 0,
"pop_min_time": 1,
"pop_max_time": 2,
"pop_min_price": 900,
"pop_carry_over": 0,
"pop_daily_card_price": 0,
"pop_business_hours": 2
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 900
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 2,
"pra_price": 1500
},
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 3,
"pra_price": 3000
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "3 Marken",
"pun_duration": 180
},
{
"pun_id": 2,
"pun_label": "5 Marken",
"pun_duration": 300
},
{
"pun_id": 3,
"pun_label": "10 Marken",
"pun_duration": 600
}
],
"WeekDaysWorktime": [
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "06:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "06:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "06:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "06:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "06:00:00",
"pwd_time_to": "12:00:00"
}
],
"SpecialDaysWorktime": [
{
"pedwt_id": 2156,
"pedwt_period_exc_day_id": 2024,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2158,
"pedwt_period_exc_day_id": 2025,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2160,
"pedwt_period_exc_day_id": 2026,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2162,
"pedwt_period_exc_day_id": 2027,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2164,
"pedwt_period_exc_day_id": 2028,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2170,
"pedwt_period_exc_day_id": 2030,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2172,
"pedwt_period_exc_day_id": 2032,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2174,
"pedwt_period_exc_day_id": 11,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2175,
"pedwt_period_exc_day_id": 13,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2178,
"pedwt_period_exc_day_id": 2022,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2179,
"pedwt_period_exc_day_id": 14,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2184,
"pedwt_period_exc_day_id": 2021,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2188,
"pedwt_period_exc_day_id": 2031,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2189,
"pedwt_period_exc_day_id": 2029,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2194,
"pedwt_period_exc_day_id": 2034,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2200,
"pedwt_period_exc_day_id": 2037,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2202,
"pedwt_period_exc_day_id": 2038,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2226,
"pedwt_period_exc_day_id": 2016,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2245,
"pedwt_period_exc_day_id": 2035,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2246,
"pedwt_period_exc_day_id": 2036,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2249,
"pedwt_period_exc_day_id": 2050,
"pedwt_time_from": "08:00:00",
"pedwt_time_to": "16:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2250,
"pedwt_period_exc_day_id": 2051,
"pedwt_time_from": "08:00:00",
"pedwt_time_to": "16:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2251,
"pedwt_period_exc_day_id": 2052,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2252,
"pedwt_period_exc_day_id": 2053,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2253,
"pedwt_period_exc_day_id": 2054,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2254,
"pedwt_period_exc_day_id": 2055,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2255,
"pedwt_period_exc_day_id": 2056,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2256,
"pedwt_period_exc_day_id": 2057,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2257,
"pedwt_period_exc_day_id": 2058,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2258,
"pedwt_period_exc_day_id": 2059,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2259,
"pedwt_period_exc_day_id": 2060,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
}
],
"SpecialDays": [
{
"ped_id": 11,
"ped_label": "Mariae Empfaengnis",
"ped_date_start": "2023-12-08",
"ped_date_end": "2023-12-08",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 13,
"ped_label": "Christtag",
"ped_date_start": "2023-12-25",
"ped_date_end": "2023-12-25",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 14,
"ped_label": "Stefanitag",
"ped_date_start": "2023-12-26",
"ped_date_end": "2023-12-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2016,
"ped_label": "Neujahr",
"ped_date_start": "2024-01-01",
"ped_date_end": "2024-01-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2021,
"ped_label": "Heilig Drei Koenige",
"ped_date_start": "2024-01-06",
"ped_date_end": "2024-01-06",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2022,
"ped_label": "Ostermontag",
"ped_date_start": "2024-01-04",
"ped_date_end": "2024-01-04",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2024,
"ped_label": "Staatsfeiertag",
"ped_date_start": "2024-05-01",
"ped_date_end": "2024-05-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2025,
"ped_label": "Christi Himmelfahrt",
"ped_date_start": "2024-05-09",
"ped_date_end": "2024-05-09",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2026,
"ped_label": "Pfingst Montag",
"ped_date_start": "2024-05-20",
"ped_date_end": "2024-05-20",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2027,
"ped_label": "Fronleichnam",
"ped_date_start": "2024-05-30",
"ped_date_end": "2024-05-30",
"ped_period_special_day_id": 1,
"ped_year": 2024
},
{
"ped_id": 2028,
"ped_label": "Maria Himmelfahrt",
"ped_date_start": "2024-08-15",
"ped_date_end": "2024-08-15",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2029,
"ped_label": "Nationalfeiertag",
"ped_date_start": "2024-10-26",
"ped_date_end": "2024-10-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2030,
"ped_label": "Allerheiligen",
"ped_date_start": "2024-11-01",
"ped_date_end": "2024-11-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2031,
"ped_label": "Mariae Empfaengnis",
"ped_date_start": "2024-08-12",
"ped_date_end": "2024-08-12",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2032,
"ped_label": "Christtag",
"ped_date_start": "2024-12-25",
"ped_date_end": "2024-12-25",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2034,
"ped_label": "Stefanitag",
"ped_date_start": "2024-12-26",
"ped_date_end": "2024-12-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2035,
"ped_label": "Neujahr",
"ped_date_start": "2025-01-01",
"ped_date_end": "2025-01-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2036,
"ped_label": "Heilig Drei Koenige",
"ped_date_start": "2025-06-01",
"ped_date_end": "2025-06-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2037,
"ped_label": "Ostermontag",
"ped_date_start": "2025-04-21",
"ped_date_end": "2025-04-21",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2038,
"ped_label": "Staatsfeiertag",
"ped_date_start": "2025-05-01",
"ped_date_end": "2025-05-01",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2050,
"ped_label": "Christi Himmelfahrt",
"ped_date_start": "2025-05-29",
"ped_date_end": "2025-05-29",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2051,
"ped_label": "Pfingstmontag",
"ped_date_start": "2025-06-09",
"ped_date_end": "2025-06-09",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2052,
"ped_label": "Fronlaeichnam",
"ped_date_start": "2025-06-19",
"ped_date_end": "2025-06-19",
"ped_period_special_day_id": 1,
"ped_year": 2025
},
{
"ped_id": 2053,
"ped_label": "Mariae Himmelfahrt",
"ped_date_start": "2025-08-15",
"ped_date_end": "2025-08-15",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2054,
"ped_label": "Nationalfeiertag",
"ped_date_start": "2025-10-26",
"ped_date_end": "2025-10-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2055,
"ped_label": "Allerheiligen",
"ped_date_start": "2025-11-01",
"ped_date_end": "2025-11-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2056,
"ped_label": "Mariae Empfaengnis",
"ped_date_start": "2025-12-08",
"ped_date_end": "2025-12-08",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2057,
"ped_label": "Christtag",
"ped_date_start": "2025-12-25",
"ped_date_end": "2025-12-25",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2058,
"ped_label": "Stefanitag",
"ped_date_start": "2025-12-26",
"ped_date_end": "2025-12-26",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2059,
"ped_label": "Neujahr",
"ped_date_start": "2026-01-01",
"ped_date_end": "2026-01-01",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2060,
"ped_label": "Heilige Drei Koenige",
"ped_date_start": "2026-01-06",
"ped_date_end": "2026-01-06",
"ped_period_special_day_id": 1,
"ped_year": 0
}
],
"PeriodYear": [
{
"pye_id": 8,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
}
]
}

217
tariffs/tariff_naz.json Normal file
View File

@@ -0,0 +1,217 @@
{
"Project" : "Nordisches Ausbildungszentrum",
"Version" : "1.0.0",
"Info" : "",
"Currency": [
{
"pcu_id": 1,
"pcu_sign": "€",
"pcu_major": "EUR",
"pcu_minor": "",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"TimeBase": [
{
"tbase_id": 0,
"tbase_type": 0,
"tbase_type_comment": "time is given as starting from some wall-clock-time",
"tbase_label": "absolute time"
},
{
"tbase_id": 1,
"tbase_type": 1,
"tbase_type_comment": "time is given as starting from 0 minutes",
"tbase_label": "relative time"
}
],
"TimeRange" : [
{
"time_range_id": 1,
"time_range_from": "00:00:00",
"time_range_to": "00:01:00",
"time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
}
],
"TimeStepConfig" : [
{
"tsconfig_id" : 1,
"tsconfig_label" : "static",
"tsconfig_comment" : "read time steps as given in jsonfiles"
},
{
"tsconfig_id" : 2,
"tsconfig_label" : "dynamic",
"tsconfig_comment" : "determine timesteps at runtime"
}
],
"Customer": [
{
"cust_id": 1,
"cust_type": 1000,
"cust_label": "Adult"
},
{
"cust_id": 2,
"cust_type": 1001,
"cust_label": "Child"
},
{
"cust_id": 3,
"cust_type": 1002,
"cust_label": "Teen"
}
],
"PaymentOption": [
{
"pop_id": 1049,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "08:00:00",
"pop_day_night_end_time": "20:00:00",
"pop_price_night": 0,
"pop_min_time": 1,
"pop_max_time": 720,
"pop_min_price": 400,
"pop_carry_over": 0,
"pop_daily_card_price": 0,
"pop_business_hours": 128
},
{
"pop_id": 1050,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "08:00:00",
"pop_day_night_end_time": "20:00:00",
"pop_price_night": 0,
"pop_min_time": 1,
"pop_max_time": 720,
"pop_min_price": 800,
"pop_carry_over": 0,
"pop_daily_card_price": 0,
"pop_business_hours": 128
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1049,
"pra_payment_unit_id": 1,
"pra_price": 400
},
{
"pra_payment_option_id": 1050,
"pra_payment_unit_id": 2,
"pra_price": 800
}
],
"DailyTicket": [
{
"daily_ticket_payment_option_id": 1049,
"daily_ticket_id": 1,
"daily_ticket_price_id": 1,
"daily_ticket_tb_id": 1,
"daily_ticket_clearance_customer_ids": [3],
"daily_ticket_from_min": "08:00:00",
"daily_ticket_to_max": "20:00:00",
"daily_ticket_from_offset_min": 0,
"daily_ticket_to_offset_max": 0
},
{
"daily_ticket_payment_option_id": 1050,
"daily_ticket_id": 2,
"daily_ticket_price_id": 2,
"daily_ticket_tb_id": 1,
"daily_ticket_clearance_customer_ids": [1],
"daily_ticket_from_min": "08:00:00",
"daily_ticket_to_max": "20:00:00",
"daily_ticket_from_offset_min": 0,
"daily_ticket_to_offset_max": 0
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "Tagesticket",
"pun_duration": 720
}
],
"WeekDaysWorktime": [
{
"pwd_id": 621,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
},
{
"pwd_id": 622,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
},
{
"pwd_id": 623,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
},
{
"pwd_id": 624,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
},
{
"pwd_id": 625,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
},
{
"pwd_id": 626,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
},
{
"pwd_id": 627,
"pwd_period_week_day_id": 36,
"pwd_period_day_in_week_id": 7,
"pwd_time_from": "08:00:00",
"pwd_time_to": "20:00:00"
}
],
"PeriodYear": [
{
"pye_id": 8,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
}
]
}

Binary file not shown.

Binary file not shown.

BIN
vue/vue.js-in-action.pdf Normal file

Binary file not shown.