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
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
0856f10ca9
GetDurationFromCost():
...
Fix computation of end-time when pop_accumulate_durations is set
in tariff-file.
2024-08-02 14:34:44 +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
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
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
260973cd09
Added pop_plus_steps/pop_minus_steps to control step sizes
2024-08-01 15:44:06 +02:00
7bf7108668
GetDurationFromCost():
...
Check if computed duration is below minimal parking time.
2024-07-31 10:26:47 +02:00
e5629ba4fd
GetDurationFromCost():
...
Check if given price is below minimal parking price.
2024-07-31 10:25:03 +02:00
e4cb992aae
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
cdeb625a15
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
589d89b73a
Calculator::GetDurationFromCost():
...
Compute duration from cost for PaymentMethod::Degressive: introduced
for Valser Alm (location: Fane).
2024-07-30 15:37:28 +02:00
7536f89d75
compute_duration_for_parking_ticket():
...
read prepaid-setting from tariff-file, if possible.
2024-07-30 15:32:58 +02:00
9a6b2b195d
get_minimal_parking_price(): compute this price dynamically according to settings
...
in the tariff-file. Introduced for Fuchs (500) for Valser Alm (Location: Fane)
2024-07-30 15:29:47 +02:00
52b7c2390a
Minor: introduce using-typedef for Duration
2024-07-29 17:33:49 +02:00
894e23332f
compute option index using permit type.
2024-07-29 17:32:15 +02:00
fbc255a6f2
Fix: compute_next_time_step(): removed check for product ids.
2024-07-29 17:31:33 +02:00
24ab01695d
GetPriceForTimeStep(): remove default parameter.
2024-07-29 17:28:27 +02:00
37652d3b6a
Save computed pop_min_time.
2024-07-29 17:27:16 +02:00
14fd7ddd39
Preperationf for Zone3.
2024-07-29 17:26:53 +02:00
ca3c3921d4
Minor: change debug output
2024-07-29 17:26:26 +02:00
9f4affca5a
Minor: removed debug output
2024-07-29 11:30:00 +02:00
4f2c33cdc2
Minor: added comments and added some debug output.
2024-07-29 11:28:07 +02:00
3cd02296b0
compute_duration_for_parking_ticket():
...
Fix: pass PERMIT_TYPE explicitly to correct arity of GetDurationFromCost().
2024-07-29 11:25:12 +02:00
f1493f417f
get_maximal_parkingprice():
...
implement for SHORT_TERM_PARKING_BUS and SHORT_TERM_PARKING_PKW.
2024-07-29 11:24:05 +02:00
356e3be178
Pass PERMIT_TYPE to get_minimal_parkingtime() and get_maximal_parkingtime()
...
to override default parameter value.
2024-07-29 11:22:22 +02:00
31b1dd1690
ResetTimeSteps():
...
Check paymentOptionIndex for correct value.
2024-07-29 11:20:00 +02:00
dbf5b1f11d
remove input correction
2024-07-26 17:34:24 +02:00
29368ea850
Remove correction
2024-07-26 17:04:33 +02:00
b84f80887e
Checkin for testing
2024-07-26 17:01:44 +02:00
4a2b15d086
Add some debug output into GetDurationForPrice().
2024-07-26 13:34:18 +02:00
8dad8f00e8
GetPriceForTimeStep(): Fix: user default payment option
2024-07-26 13:11:29 +02:00
805a732c52
GetPriceForTimeStep(): add prices for computed timesteps. Return maximal
...
price which is still smaller or equal then (input-)price.
2024-07-26 12:53:42 +02:00
b7facb9d60
checkin for tariff02.json
2024-07-26 10:59:45 +02:00
8344b04b15
Use of permitType in several places
2024-07-25 09:49:16 +02:00
b0ecef0361
Use of permitType in several places
2024-07-25 09:48:12 +02:00
003b7e8e8a
getPaymentOption() functions and getPaymentOptionIndex()
2024-07-25 09:46:46 +02:00
7ef2d44fc4
Add parameter PermitType to GetCostForDuration() and GetDurationFromCost()
2024-07-25 09:45:36 +02:00
8f203184b6
Add additional parameter (PermitType) to several functions
2024-07-25 09:44:24 +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
7d452c82b7
Added pop_product_id and pop_product_name
2024-07-24 17:33:53 +02:00
0a08221381
Added conversion from QString to PermitType
2024-07-24 17:33:06 +02:00
b4b2e27fe3
Removed some debug output for testing
2024-07-24 12:37:29 +02:00
b19cfd693c
Minor: add some debug output.
2024-07-24 12:34:05 +02:00
78921c8870
IMPORTANT: isParkingAllowedForWeekDay(): deactivated for testing !!!
2024-07-24 12:30:46 +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
2b30e9562f
Recompute time step list (previously is was saved as an optimization)
2024-07-23 12:51:08 +02:00
eb4ef0c3b5
Allow adjustment of the step list by a tolerance of 5 minutes per step
2024-07-23 12:48:50 +02:00
da05d004dd
Introduced 'pun_duration_saved': to be used when time steps have to be re-calculated.
2024-07-23 12:46:44 +02:00
abf4ef0b00
GetPriceForTimeStep():
...
Use special flag 'pop_accumulate_prices' to add up prices given in the
tariff json file.
2024-07-23 11:53:22 +02:00
49fb860129
Minor: fixed printing of 'cost'.
2024-07-23 11:47:48 +02:00
69edc8e898
compute_product_price(): add new Products (CAR, BUS, CAMPER).
2024-07-23 11:45:34 +02:00
40440e28d3
Read pop_accumulate_prices and pop_accumulate_durations.
2024-07-22 15:56:04 +02:00
ba8e2786fc
GetTimeSteps():
...
updated as well for Schnals (505). Still to be tested.
2024-07-22 15:54:36 +02:00
b5804408f4
GetDurationFromCost():
...
expanded. still to be tested.
2024-07-22 15:53:27 +02:00
f7be0e471a
getDurationFromCost():
...
call
Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate);
for its side-effects.
Timesteps will be used in the following calculation.
2024-07-22 15:50:36 +02:00
45694106a7
GetTimeSteps():
...
added default parameter 'start'; was set inside the funtion.
2024-07-22 15:48:21 +02:00
6d125c65fe
Added flags
...
pop_accumulate_prices
pop_accumulate_durations
to decide if values in json files should be accumulated or not.
2024-07-22 15:46:45 +02:00
3503306637
save experimental
2024-07-21 20:58:12 +02:00
977356040c
Added changes for Schnals
2024-07-19 14:10:07 +02:00
2a89f90745
Added parsing for Interpolation, CarryOver and Prepaid-options. Has to be formatted.w
2024-07-19 14:09:04 +02:00
f2356bec55
Added new products
2024-07-19 14:04:20 +02:00
2d6ef2d158
Add prepaid and carry over option
2024-07-19 14:03:46 +02:00
02927be9c9
Added interpolation, carryover and prepaid types
2024-07-19 14:02:41 +02:00
c6d396f34b
Added handling for interpolation, carry over and prepaid.
2024-07-19 14:01:27 +02:00
026c791c79
Add interpolation and operator<<
2024-07-19 14:01:00 +02:00
927164e23e
Added headers for interpolation, prepaid and carryover
2024-07-19 13:59:56 +02:00
507b5d1b9c
Add Interpolation, Prepaid and CarryOver structures to streamline Json-File layout.
2024-07-19 13:58:22 +02:00
c153652b3d
compute_next_timestep(): allow some tolerance for first time-step
2024-07-16 16:50:11 +02:00
d7e185006f
GetTimeSteps(): add sanity check
2024-07-16 16:47:26 +02:00
c3c888dc04
GetTimeSteps(): remove list as reference so compute_next_timestep)_ can change it
2024-07-16 16:46:43 +02:00
34fbefc138
save for the weekend
2024-06-07 13:33:04 +02:00
48fccafe76
Fix: GetDurationFromCost() -> set inputDate if next valid working time-range
...
in on another day and break the loop iterating through next days.
2024-06-06 14:04:04 +02:00
9394625d35
Minor: show debug output only when compiled in.
2024-06-06 14:02:43 +02:00
57ccbc150a
compute_duration_for_parking_ticket(): set calcState according to string
...
returned from tariff calculation.
2024-06-05 17:03:33 +02:00
8fa4335669
Minor: fixed typo.
2024-06-05 17:03:10 +02:00