63 Commits

Author SHA1 Message Date
7a53a68850 getPaymentOptionIndex(): add start-time parameter 2024-09-06 12:05:41 +02:00
6d2bde1fe9 getPaymentOptionIndex():
Fix: make sure only one payment option can be chosen.
2024-09-03 11:17:31 +02:00
f02521d3c2 parseWeekDay():
for the park-time-limit checking take into account that the
 	start-date-time and end-date-time are on different days.
2024-09-03 11:15:08 +02:00
349e9d8b06 Add free functions isHoliday() to check if the current day is a holiday
and previousDayHoliday() to check if previous day (relative to endtime) is a
holiday.
2024-09-02 17:05:32 +02:00
68a1c24861 Add free function getPaymentOptionIndex():
Compute payment option index base on current start-date-time and
	businesshour-setiing in tariff-file.
	Returns -1 to indicate error.
2024-09-02 17:03:37 +02:00
c946c106d1 Configuration::ParseJson():
Save the pop_plus_steps setting: sometimes it is necessary to adapt the
	pop_plus_steps-variable in order to hit a time-limit-boundary exactly.
	Otherwise the next computed time-step might overshoot the time-limit,
	and when moving backwards (via Minus-Button) there is a better
	resolution: going backwards, the user could hit the exact time-limit,
	which he could not when going up.
2024-09-02 16:58:34 +02:00
f24f1fe646 Configuration::ParseJson():
Call parseWeekDay() to reading the week-day-settings.
2024-09-02 16:57:11 +02:00
c6b8a37263 ParseJson():
Minor: some reformatting of source code.
2024-09-02 16:55:48 +02:00
58d8f16681 ParseWeekDay():
Parsing "Monday" - "Sunday" section i a tariff-file.

	Each day has a memebr named "week_day_default".

	It contains the valid default tariff settings for a usual day (i.e. no
	holiday etc.)
	It also contains the carry-over-settings for the usual day.

	In case there is some holiday on this day (for instance on "Monday"),
	the the date of the holiday replaces the name "week_day_default".
	Otherwise the structure is the same as for a usual day.
2024-09-02 16:49:21 +02:00
431664d8b9 IdentifyJsonMember():
Add "Monday" - "Sunday" as level-1 sections in a tariff-file.
2024-09-02 16:47:46 +02:00
7c173ae292 parse for pop_allow_overpay 2024-08-21 15:38:06 +02:00
f0677374ec Parsing of pop_plus_steps/pop_minus_steps 2024-08-01 15:46:49 +02:00
4f2c33cdc2 Minor: added comments and added some debug output. 2024-07-29 11:28:07 +02:00
b7facb9d60 checkin for tariff02.json 2024-07-26 10:59:45 +02:00
0bfec6a938 Added getPaymentOptionIndex() and getPaymentOptionsForAllKeys() 2024-07-25 09:43:16 +02:00
4d7e5263ee Added parsing of pop_product_id and pop_product_name. 2024-07-24 17:34:28 +02:00
e891bfc5de Only check for prepaid == never. 2024-07-24 12:23:15 +02:00
a6922976bf Minor: remove some debug output. 2024-07-24 12:22:47 +02:00
7f25c46d30 Set pun_duration_saved 2024-07-23 12:51:51 +02:00
40440e28d3 Read pop_accumulate_prices and pop_accumulate_durations. 2024-07-22 15:56:04 +02:00
3503306637 save experimental 2024-07-21 20:58:12 +02:00
2a89f90745 Added parsing for Interpolation, CarryOver and Prepaid-options. Has to be formatted.w 2024-07-19 14:09:04 +02:00
4d5583df2d Handling for pop_carry_over_traget. 2024-05-07 14:59:00 +02:00
b71c979a91 Fix: getPaymentOptionIndex() -> return 0 instead of -1
Removed exit(0)-call which was used for testing.
2024-05-06 11:36:12 +02:00
33f43fb83d Start parsing of pop_min_date_time and pop_max_date_time 2024-05-03 13:50:10 +02:00
4ec5589f30 Implement getTariffProductForProductId() in terms of
getTariffProductForProductTypeName().
2024-04-30 13:49:49 +02:00
c1d5ffcf3c Implement getTariffProductForProductTypeName().
Use the type names of PERMIT_TYPE, not real indices as they can change.
2024-04-30 13:48:03 +02:00
7aded2b7fb Explicit cast due to compiler warning. 2024-04-30 13:46:59 +02:00
e2c02420f0 Add parsing for new values in helper-structures.
NOTE: unfortunately switched to Unix-File-Format.
2024-04-19 13:26:33 +02:00
b0c4ad0e2e getCurrentPaymentOptionIndex(): start implementation.
getPaymentOptions(): use new parameter paymentOptionIndex.
2024-04-12 14:31:02 +02:00
e980d8c451 Implement
std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
2024-02-22 16:34:57 +01:00
afb0e20dd2 Implement parsing of "Product" and adding into TariffProduct. 2024-02-22 16:33:19 +01:00
c0f0648a74 checkin for the weekend. proper commit-messages later 2024-02-16 13:37:24 +01:00
707ab1716b Add addition parsing of ATBTimeRange. 2024-02-15 16:13:28 +01:00
f87399ed44 Fixed getWeekDayWorkTime(). Parameter 'time' must be inside [from, to[. 2024-01-31 11:42:33 +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
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
bcd5aaf932 Minor: add debug output 2024-01-22 13:41:50 +01:00
e9b10166d2 Minor: implement getPaymentOptions() for const. Add getPaymentOptions() for non-const 2024-01-22 13:33:23 +01:00
a8de97a528 Initialize TimeBase multimap. 2024-01-22 10:24:32 +01:00
ff314c810f Add TimeBase to configuration object. 2024-01-18 15:00:42 +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