eb20410849
Use paymentOptionIndex in getPaymentOptions()
2024-05-08 16:34:07 +02:00
6a5272da7a
Fix: Check if endTime is still on the same day.
2024-05-07 15:01:16 +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
1dd81d4a56
get_minimal_parkingtime(): const Configuration parameter.
...
Cast of const pointer necessary.
get_maximal_parkingtime(): const Configuration parameter.
2024-04-30 14:08:08 +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
c7623429d9
Compute end_parking_time using "netto_parking_time", which is the
...
current timestep.
2024-04-25 15:41:52 +02:00
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
ea0bcde413
Check iterator for it != cfg->TimeRange.cend().
2024-04-24 13:16:22 +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
1852f552a3
compute_price_for_parking_ticket(): compute paymentOptionIndex.
...
(a tariff-file can conatin more than one payment options).
2024-04-19 13:28:35 +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
e20eb93abf
Implement SpecialDaysWorkTimeFrom() and SpecialDaysWorkTimeUntil().
...
Extend getBusinessHours() to include new enum-values.
Implement isDayIncluded() as switch-case on dayOfWeek.
Implement dumpBusinessHours().
2024-04-19 13:21:38 +02:00
b70094abb5
Extend compute_product_price() for use of PERMIT_TYPE::DAY_TICKET.
...
First time used for Neuhauder-Pernegg-an-der-Mur.
2024-04-16 12:10:34 +02:00
cd159f2bbd
Add case for BusinessHours::NoRestriction_24_7: used for Neuhauder-Christoph-Reisen
2024-04-16 12:05:55 +02:00
b0c4ad0e2e
getCurrentPaymentOptionIndex(): start implementation.
...
getPaymentOptions(): use new parameter paymentOptionIndex.
2024-04-12 14:31:02 +02:00
7e3347b043
GetTimeSteps(): use new parameter paymentOptionIndex
2024-04-12 14:30:04 +02:00
4e7fa83507
get_minimal_parkingtime()
...
get_maximal_parkingtime()
get_minimal_parkingprice()
get_maximal_parkingprice():
use new parameter paymentOptionIndex.
2024-04-12 14:27:08 +02:00
9b1cc49d34
Minor: remove some debug output
2024-04-12 14:16:18 +02:00
aba38d2614
compute_price_for_parking_ticket(): add handling for PaymentMethod::Steps.
2024-04-08 13:58:24 +02:00
57d6b85f52
get_maximal_parking_price(): add handling for PaymentMethod::Steps.
2024-04-08 13:57:40 +02:00
627d14204d
Use paymentRate.last() instead of aymentRate.at(0) so we can enter new entries
...
in tariff-files to provide the prices for an hour.
2024-03-07 08:17:32 +01:00
a744a1ebb3
compute_product_price(): add handling for FOOD_STAMP
2024-02-28 12:06:02 +01:00
df16bd7f9c
GetDailyTicketPrice(): add case for FOOD_STAMP (not implemented)
2024-02-28 12:05:14 +01:00
8bbec596c9
Check for 08:00 <= currentTime <= 20:00 removed:
...
assumption is prepaid.
2024-02-28 09:58:00 +01:00
87b14ee3f8
Added check for NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM:
...
08:00 <= currentTime <= 20:00.
2024-02-28 09:26:51 +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
bd1bdf8a8c
Implement compute_procuct_price()
2024-02-22 16:38:41 +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
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
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
c0f81f174a
compute_price_for_parking_ticket(): added parameter bool prepaid. Set to true as default.
2024-02-22 09:42:02 +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
ce61e5d3b2
compute_next_timestep(): use fpr PaymentMenthod::Progressive
...
same code as for PaymentMethod::Steps, as GetTimeSteps() inside
the Calculator class has been adapted accordingly.
2024-02-21 11:11:09 +01:00
e0223b50f9
Added helper getTimeRangeStep() (useful for progressive tariff as for neuhauser/kirchdorf (743)
2024-02-21 09:31:13 +01:00
690267c388
get_maximal_parkingprice(): in case of progressive tariff, read maximal parking time
...
directly form tariff-file as there is not price per hour.
2024-02-20 15:47:02 +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
8470bdd574
Minor: change type of parameter 'start-parking-time' to non-const.
2024-02-15 16:14:21 +01:00
707ab1716b
Add addition parsing of ATBTimeRange.
2024-02-15 16:13:28 +01:00
92c3b7c97c
Add helper WorkDayId() for future use.
2024-02-15 16:11:41 +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
87c0f4397b
Remove meset for price. Rely on default-constructor.
2024-01-31 15:15:44 +01:00
0b779b7846
getBusinessHours(): return values with correct type.
2024-01-31 15:10:45 +01:00
25a39fdc61
Fix getPaymentMethodId(): check for valid iterator.
2024-01-31 15:09:42 +01:00
f87399ed44
Fixed getWeekDayWorkTime(). Parameter 'time' must be inside [from, to[.
2024-01-31 11:42:33 +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
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
8077167498
Minor: remove unused protection_counter variable
2024-01-30 10:52:24 +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
4c1cd45866
Implemented compute_price_for_daily_ticket().
2024-01-30 10:41:29 +01:00
6bf3960349
Re-implemented get_minimal_parkingtime() using PERMIT_TYPE-parameter.
...
Implemented get_maximal_parkingtime(), get_minimal_parkingprice()
and get_maximal_parkingprice().
2024-01-30 10:39:24 +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
1b933c05a6
Remove static instance of calculator. Replaced with use of Calculator-singleton-calss.
2024-01-23 10:55:00 +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
179d3348b9
Minor: Fixed typo
2024-01-22 15:44:13 +01:00
b43fa274bd
Implement get_minimal_parkingtime() and get_time_steps().
2024-01-22 15:41:20 +01:00
0671a6dde6
Add get_time_steps().
2024-01-22 14:46:40 +01:00
d7757773bd
Implement get_calculator()
2024-01-22 14:29:02 +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
33731faba9
GetTimeSteps(): compute minimal parking time and set pop_min_time.
2024-01-22 13:31:00 +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
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
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
7ce93ddd7a
Extend handling of TimeRangeType.
2024-01-18 14:53:57 +01:00
7f8ed9165d
Add handling for TimeStepConfig.
2024-01-18 14:53:01 +01:00
bb83ae3074
Fix: add a 'break' in swich/case.
2023-12-15 13:25:09 +01:00
c598014dd0
Add parsing of
...
ATBDailyTicket DailyTicket;
ATBTimeBase TimeBase;
ATBCustomer Customer;
ATBTimeRange TimeRange;
2023-12-15 13:24:29 +01:00
ad534eef09
Add 4 new data type for IdentifyJsonMember().
2023-12-15 13:22:49 +01:00
5ee73bf804
IdentifyJsonMember(): add 4 new data types:
...
DailyTicket, TimeBase, Customer and TimeRange.
2023-12-15 13:20:42 +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
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
