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
d11cffb8bd
Set pop_business_hours when parsing json-tariff-file.
2023-12-12 10:34:39 +01:00
282a412ef5
IsYearPeriodActive(): return true, even if no YearPeriod is given in tariff-json-file.
2023-12-12 10:23:45 +01:00
9dcf7a8f30
Implement added helpers.
2023-12-12 10:22:34 +01:00
88e92dddb9
Fix: nextTimeStep must be between minParkingTime and maxParkingTime.
2023-12-11 09:00:24 +01:00
0f05a1a784
(1) Fix debug output.
...
(2) Use UpDown-Argument for calculation of next tiem step.
2023-12-08 10:16:52 +01:00
2d696941a5
Fix: use second.pun_duration instead of second.pun_id
...
Minor: add debug output.
2023-12-08 10:14:48 +01:00
5598b02816
Make distinction base on PaymentMethod, not on some
...
other data contained in json-tariff-file.
2023-12-07 17:00:28 +01:00
b9a7c04db9
Add compute_next_timestep() computing timesteps if PaymentMethod = Steps.
...
Add additional code for computing time steps dynamically if PaymentMethod = Linear.
2023-12-07 16:28:17 +01:00
5b8d9c62cc
Add and implement utilities:
...
int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
uint32_t getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId);
uint32_t getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId);
2023-12-07 16:27:09 +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
e97ad17b09
removed typo
2023-12-01 14:24:51 +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
9a19320ee5
Minor: removed debug output.
2023-11-28 15:15:13 +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
6a3d183129
Minor: overload constructor
2023-11-27 16:14:27 +01:00
684de4acd1
Reformat to Unix.
...
Add overload for IsYearPeriodActive().
Add several helpers.
2023-11-27 16:12:07 +01:00
b84970fd12
Add class Ticket for future use.
2023-11-26 19:56:38 +01:00
7ac033720e
Started re-implementation of GetCostFromDuration() using
...
private_GetCostFromDuration().
2023-11-26 19:55:21 +01:00
c4cec1c04b
Added overload for CheckSpecialDay().
...
Added helpers SpecialDaysWorkTimeFrom() and SpecialDaysWorkTimeUntil().
2023-11-26 19:51:37 +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
cd77e380ef
Read project/version-info from tariff-config ...
...
... if available
2023-11-22 11:27:09 +01:00
509bc29d7e
Fix: read tariff configuration file
2023-11-22 10:17:40 +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
