275c3ec869
compute_price_for_parking_ticket():
...
Pass start-date-time to parking-time-checker.
2024-09-03 11:19:23 +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
75f1c1bb76
Checking parking-time-limit:
...
provide start-date-time as well, because the limit counts only
from one day to following day (e.g. Sunday to Monday or from
holiday to next day).
2024-09-03 11:10:24 +02:00
f47695de8b
Add pop_plus_steps_saved
2024-09-02 17:16:47 +02:00
cce3db301b
Minor: comment out some code to prevent compiler warnings (about some unused
...
variables).
2024-09-02 17:15:33 +02:00
5cab0de9fb
Use free function getPaymentOptionIndex() to compute index of valid
...
payment-option-section in tariff-file based on configured businessHours.
2024-09-02 17:14:20 +02:00
f92906f680
Minor: debug output.
2024-09-02 17:13:11 +02:00
8cdeef26fc
Check if computed ticket-end-time violates a carry-over-limit defined in
...
tariff-file.
2024-09-02 17:11:48 +02:00
52ebbf7bc9
Use free function getPaymentOptionIndex() in serveral places to compute valid
...
index of a payment-option-section within tariff file. If this is not possible,
then try the already available functionality.
2024-09-02 17:09:26 +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
53cf9a7341
Add description for tariff-settings.w
2024-09-02 16:46:00 +02:00
3a18ee2d7c
Add description for carry-over-settings
2024-09-02 16:45:35 +02:00
929a8a4a27
Reuse of "class ATBWeekDays":
...
Description of a weekday: Mon-Sun. For holidays contains a type-flag
to indicate such a day.
Each weekday has some tariff-settings and some carry-over-settings.
2024-09-02 16:41:26 +02:00
2b9657787d
add tests for bad-neuenahr
2024-09-02 16:40:38 +02:00
eca285cc25
remove obsolete print-function
2024-09-02 16:40:07 +02:00
bda8914f1a
Add free functions:
...
previousDayHoliday():
Check if previous day was a holiday. Check is done relative to
computed endtime.
isHoliday():
Check if startDateTime is on a holiday.
getPaymentOptionIndex():
Compute the index of the payment-options-section inside a tariff-file.
This is done as workaround (and backward compatibility).
parseWeekDay():
Parse new structure of tariff-file.
2024-09-02 16:35:25 +02:00
a3983ed427
check for time-step-config == STATIC
2024-08-21 17:46:35 +02:00
f8805e9e78
compute_duration_for_parking_ticket():
...
Fix: handle carry-over for coin-insertion.
2024-08-21 15:40:55 +02:00
7a6360f392
compute_duration_for_parking_ticket():
...
Fix: handle prepaid-setting for coin-insertion.
2024-08-21 15:39:44 +02:00
08a249f393
return OVERPAID in case overpay is not allowed
2024-08-21 15:39:05 +02:00
7c173ae292
parse for pop_allow_overpay
2024-08-21 15:38:06 +02:00
80637260f3
Utilities::IsYearPeriodActive():
...
Fix: take into account if start-date <= end-date or not.
Otherwise check is wrong, and no valid year period is returned.
2024-08-21 15:35:03 +02:00
9b524d63e5
Add 'pop_allow_overpay' setting: set vai tariff-file if operpay is allowed.
2024-08-21 15:33:02 +02:00
25b3143d88
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 14:37:42 +02:00
0856f10ca9
GetDurationFromCost():
...
Fix computation of end-time when pop_accumulate_durations is set
in tariff-file.
2024-08-02 14:34:44 +02:00
88c703ecc2
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 13:21:54 +02:00
465b2274a1
compute_duration_for_parking_ticket():
...
Adapt end-time in case it is midnight: 00:00 -> 23:59
2024-08-02 13:15:11 +02:00
f946cd13e4
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 11:55:12 +02:00
8d1cbe7337
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 11:29:10 +02:00
62c52fd580
test case for fuchs, fane alm.
2024-08-02 11:13:50 +02:00
1023f6ede1
GetPriceForTimeStep():
...
Use "pop_accumulate_durations" setting to sum up the durations.
Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
36b3e85d1b
GetCostFromDuration():
...
recompute timestep list to make sure that time step is found in it.
2024-08-02 11:11:20 +02:00
b394ed46cc
In case end-parking-time ends with 00:00, set it to 23:59.
2024-08-02 11:09:20 +02:00
3dda2d8355
Check if prepaid-option is set.
2024-08-02 11:08:52 +02:00
1152c3824e
Minor: add some debug output.
2024-08-02 11:08:32 +02:00
4271c0fb31
Fixed compute_next_timestep() for degressive tariff:
...
compute_next_timestep() was actually never called for such a tariff.
2024-08-02 10:50:25 +02:00
24d9d4a0ff
test case for kleipeda and fuchs
2024-08-01 16:46:09 +02:00
4bce854d77
GetDurationFromCost():
...
Set durationInSecs in case 'pop_accumulate_prices' is not configured
in tariff file.
2024-08-01 16:44:06 +02:00
138221759b
GetDurationFromCost():
...
Minor: removed some debug ouput
2024-08-01 16:43:19 +02:00
9cb7d4aea6
compute_price_for_parking_ticket():
...
Added handling for prepaid and carry-over.
2024-08-01 16:04:57 +02:00
cde490bab2
compute_next_time_step():
...
Added handling with pop_plus_steps/pop_minus_steps:
'+' usually takes more than one time step.
'-' is usually 1.
Changed behaviour when current time is not found in the list of time steps:
Search for the entry with the smallest distance to 'current time'.
If the distance is smaller than 3 minutes, then use 'current time' as new
entry in the list of time steps.
2024-08-01 16:00:10 +02:00
f0677374ec
Parsing of pop_plus_steps/pop_minus_steps
2024-08-01 15:46:49 +02:00
89b05ffadc
Added GetYearPeriodActive() to get active year period.
2024-08-01 15:45:50 +02:00
