b596086245
Pass paymentOptionIndex to cfg->getPaymentOptions(), which has
...
a default parameter of paymentOptionIndex=0.
2024-04-24 13:20:02 +02:00
24ca857b6f
Fix: init m_timeSteps-vector in case its size is 0: m_timeSteps.push_back(QList<int>()).
...
Detected during testing.
2024-04-24 13:18:23 +02:00
d07fdd8540
GetPriceForTimeStep(): use parameter paymentOptionIndex.
2024-04-19 13:33:54 +02:00
1fab458de3
Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay()
...
and isParkingAllowed() (4 parameters) using the 2 functions.
2024-04-19 13:32:24 +02:00
1ac2ca91c5
GetCostFromDuration(): use new parameter paymentOptionIndex.
2024-04-19 13:31:01 +02:00
cd159f2bbd
Add case for BusinessHours::NoRestriction_24_7: used for Neuhauder-Christoph-Reisen
2024-04-16 12:05:55 +02:00
7e3347b043
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
df16bd7f9c
GetDailyTicketPrice(): add case for FOOD_STAMP (not implemented)
2024-02-28 12:05:14 +01:00
7831329b11
kirchdorf: getDurationFromCost(): to be tested
2024-02-27 17:11:00 +01:00
abbbd06f93
GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive
...
(e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
b741d2e312
test
2024-02-26 16:57:37 +01:00
6d18ce4caa
GetDailyTicketPrice(): improve for projects which have not defined a daily ticket in their tariff-files.
2024-02-22 16:37:11 +01:00
56fc95e33c
GetDurationFromCost(): reverted, as there is a new default parameter (prepaid)
...
in compute_price_for_parming_ticket().
2024-02-22 09:43:04 +01:00
1a350c0aeb
GetDurationFromCost(): aded section if prepaid is not set.
...
E.g. for Linsinger Maschinenbau (Neuhauser, 741): here, the buying
of food stamps is obviously only possible at certain times.
2024-02-22 09:31:41 +01:00
7933c826e6
Synced GetDurationFromCost() with GetCostFromDuration()
2024-02-21 14:53:06 +01:00
9d5ddfc328
GetCostFromDuration(): fixed moving from time range 8:00-12:00 -> 14:00-18:00.
2024-02-21 14:20:51 +01:00
102607b71f
GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf).
...
Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
81d515eb7f
GetCostFromDuration(): set endtime to start in case cost==0.
2024-02-21 11:13:53 +01:00
9c19414e5a
GetDurationFromCost(): add some sanity checks for cost. Check if cost < minParkingPrice.
...
Cut cost internally to maxParkingPrice if cost > maxParkingPrice.
2024-02-20 13:47:45 +01:00
696ce644ab
GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff)
...
there is no carry over.
2024-02-19 12:00:45 +01:00
9ea2037eca
GetDurationFromCost(): in case of progressive tariff
...
-> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
c0f0648a74
checkin for the weekend. proper commit-messages later
2024-02-16 13:37:24 +01:00
1d7779f666
GetCostFromDuration(): implement progressive tariff for Kirchdorf.
2024-02-15 16:15:28 +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
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
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
1173732172
removed typo
2024-01-23 11:03:42 +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
89b7589600
Minor: add debug output
2024-01-23 09:02:55 +01:00
b43fa274bd
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
33731faba9
GetTimeSteps(): compute minimal parking time and set pop_min_time.
2024-01-22 13:31:00 +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
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
3006e64b37
private_GetDurationFromCost():
...
set static variables using helpers moved to namespace Utilities.
2023-12-12 10:58:08 +01:00
c8218bd7af
private_GetDurationFromCost():
...
remove superfluous check if there are special days listed in
json-tariff-file.
2023-12-12 10:56:58 +01:00
ba3dfcd3d6
Minor: private_GetCostFromDuration():
...
define static variables using helpers moved to namespace Utilities.
2023-12-12 10:55:19 +01:00
c51d350618
Minor: Moved
...
getMinimalParkingTime(), getMaximalParkingTime(), getMinimalParkingPrice()
computeWeekDaysPrice() and computeWeekDaysDurationUnit() to Utilities
namespace.
2023-12-12 10:53:10 +01:00
a95a39a557
GetCostFromDuration():
...
1: Get payment method from tariff file.
2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case)
3: Add new code for neuhauser/linsinger maschinenbau:
Very similar to Schoenau, but here there are extra operating times
6.00-18.00 during the week, 6-12 on Saturday.
Check if the current time is inside such time ranges and return
associated price.
2023-12-12 10:52:16 +01:00
67b12f4b33
Private GetCostFromDuration() and GetCostFromDuration() helpers:
...
Use pyament method id (=4) as condition for if(...).
The other condition (tariffIs24_7()) is used in calling functions.
2023-12-12 10:49:51 +01:00
60002404da
GetDurationFromCost():
...
1: Get payment method from tariff file.
2: Use tariffIs24_7() helper (Tariff for Schoenau is such a case)
3: Add new code for neuhauser/linsinger maschinenbau:
Very similar to Schoenau, but here there are extra operating times
6.00-18.00 during the week, 6-12 on Saturday.
Check if the current time is inside such time ranges and return
associated price.
2023-12-12 10:43:16 +01:00
54e9a0f86d
Minor: add debug ouput (and commnt it out)
2023-12-06 10:51:46 +01:00
d7beb3b41b
Fix: replace 'continue' with 'break' to return first fitting time-range
...
in findNextWorkTimeRange().
2023-12-06 10:49:33 +01:00
9d220df52e
Mainly removed debug output. Regression tests with szeged looking good.
2023-12-05 17:31:56 +01:00
19428ce46c
implemented both cost and duration functions. to be tested
2023-12-01 14:24:15 +01:00
4c268e6693
Added draft implementation of private_GetDurationFromCost().
2023-11-28 16:43:03 +01:00
64c005cd70
Implement private_GetCostFromDuration() using a loop and not using
...
recursive calls.
2023-11-28 15:25:37 +01:00
9abc165a7c
Implemented computeWeekDaysPrice() and computeWeekDaysDurationUnit()
2023-11-28 15:20:31 +01:00
7a5d797ae0
Start reimplementation of
...
private_GetCostFromDuration() in terms of ticket.
2023-11-27 16:21:28 +01:00
215667af61
Implement findWorkTimeRange() and indNextWorkTimeRange().
2023-11-27 16:19:39 +01:00
2b6d116200
Implement GetCostFromDuration() in terms of private_GetCostFromDuration()
...
using a ticket as return value.
2023-11-27 16:18:06 +01:00
7ac033720e
Started re-implementation of GetCostFromDuration() using
...
private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
d765997ca5
dos2unix. add TODO comment
2023-11-24 13:52:49 +01:00
36478e111e
start changes for neuhauser
2023-11-24 13:23:59 +01:00
8f2609c4ae
Fix: GetDurationFromCost for PaymentMethod::Steps
2023-11-23 11:14:21 +01:00
453ca266a5
Merge remote-tracking branch 'origin/schoenau_23112023'
2023-11-23 09:46:42 +01:00
0217bb8918
GetTimeStep() and GetPriceForTimeStep(): use getPaymentOptions().
2023-11-23 09:41:40 +01:00
4b35b1ffb7
Implement GetDurationForPrice().
2023-11-23 09:41:02 +01:00
80e228b498
GetCostFromDuration(): don't use condiftion PaymentMethod::Steps,
...
but the multimap YearPeriod, which must be empty.
2023-11-23 09:39:26 +01:00
574161ff76
Call getDurationForPrice() in GetDurationForCost().
2023-11-23 09:38:34 +01:00
ccbf07a654
Use new getPaymentOptions interface
2023-11-23 08:42:35 +01:00
3a2e521345
Add interface to access 'PaymentOptions'
2023-11-22 16:27:41 +01:00
f7e462188f
Add methods for PaymentMethod::Steps
2023-11-22 09:53:07 +01:00
cb8cd5dead
Merge branch 'moransBranch'
2023-06-14 11:28:27 +02:00
eefdde4693
Removed section whith superfluous 'price_per_unit < 0' check.
...
Removed calc_price-caculation followed by shift of inputDate.
2023-06-13 12:12:23 +02:00
23748966de
Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
2023-05-19 15:49:38 +02:00
7bd7f66666
Fixed pra_payment_unit_id
2023-05-17 10:08:02 +02:00
268d43cdea
GetDailyTicketDuration: use QDateTime for timestamps
2023-05-16 16:43:45 +02:00
eef94a3fb3
Change interface: use QDateTime
...
- use QDateTime instead of char*-string
- GetCostFromDuration: add end_datetime as a return value
2023-05-16 15:31:53 +02:00
29986e0451
Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
2023-05-15 16:58:48 +02:00
617eee39ed
Daily ticket
2023-05-15 14:05:55 +02:00
6b3c1cbf0c
Fix with min time in GetDurationFromCost
2023-05-14 17:19:24 +02:00
1142efaec2
Rounding minutes seems to be fixed ...
2023-05-14 16:15:37 +02:00
6d001f1501
Fix: QDateTime.addSecs() creates a new object
2023-05-12 14:28:30 +02:00
2f8c8cab4c
Another small fix on GetDurationFromCost()
2023-05-12 13:02:10 +02:00
2599513ef9
Minor fixes with +/- 1 minute offset.
2023-05-12 12:40:25 +02:00
ef66c1f0c0
Fixed GetDurationFromCost()
2023-05-12 11:55:35 +02:00
219d820104
GetCostFromDuration fixed
2023-05-12 09:20:46 +02:00
ed9166c226
Windows: set timezone as -3600.
2023-05-11 13:58:33 +02:00
69c48e3acc
Correction for argument-value of localtime_r()-function
...
(expects UTC-time instead of local time.)
2023-05-10 13:08:28 +02:00
889fceaae0
Use strftime to get ISO time format for valid ticket end time.
2023-05-09 13:03:51 +02:00
136e6687b8
remove wrong debug-out-put. Use ceil() instead on floor() to prevent rounding error.:w
2023-05-09 11:52:17 +02:00
b02115bf75
Prepare the use of ceil() instead of floor().
2023-05-09 11:41:41 +02:00
90cf509d97
start repository for mobilisis tariff-calculation
2023-04-24 15:31:46 +02:00
