This website requires JavaScript.
ceef73195d
Add helper structure
Gerhard Hoffmann
2023-12-12 10:26:13 +0100
282a412ef5
IsYearPeriodActive(): return true, even if no YearPeriod is given in tariff-json-file.
Gerhard Hoffmann
2023-12-12 10:23:45 +0100
9dcf7a8f30
Implement added helpers.
Gerhard Hoffmann
2023-12-12 10:22:34 +0100
4187598edf
Add helpers for collecting them in Utilities namespave. BusinessHours getBusinessHours(Configuration const *cfg, PaymentMethod methodId); uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id); double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);
Gerhard Hoffmann
2023-12-12 10:20:02 +0100
88e92dddb9
Fix: nextTimeStep must be between minParkingTime and maxParkingTime.
neuhauser_korneuburg
Gerhard Hoffmann
2023-12-11 09:00:24 +0100
0f05a1a784
(1) Fix debug output. (2) Use UpDown-Argument for calculation of next tiem step.
Gerhard Hoffmann
2023-12-08 10:16:52 +0100
2d696941a5
Fix: use second.pun_duration instead of second.pun_id Minor: add debug output.
Gerhard Hoffmann
2023-12-08 10:14:48 +0100
5598b02816
Make distinction base on PaymentMethod, not on some other data contained in json-tariff-file.
Gerhard Hoffmann
2023-12-07 17:00:28 +0100
548447af1f
set -O option to calm down compiler because of FORTIFY_SOURCE=2 option
Gerhard Hoffmann
2023-12-07 17:00:03 +0100
b9a7c04db9
Add compute_next_timestep() computing timesteps if PaymentMethod = Steps. Add additional code for computing time steps dynamically if PaymentMethod = Linear.
Gerhard Hoffmann
2023-12-07 16:28:17 +0100
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);
Gerhard Hoffmann
2023-12-07 16:27:09 +0100
56e2843ddb
Add compute_next_timestep().
Gerhard Hoffmann
2023-12-07 16:26:09 +0100
6b76c4c2dd
Add test cases for neuhauser.
Gerhard Hoffmann
2023-12-06 10:52:35 +0100
54e9a0f86d
Minor: add debug ouput (and commnt it out)
Gerhard Hoffmann
2023-12-06 10:51:46 +0100
d7beb3b41b
Fix: replace 'continue' with 'break' to return first fitting time-range in findNextWorkTimeRange().
Gerhard Hoffmann
2023-12-06 10:49:33 +0100
9d220df52e
Mainly removed debug output. Regression tests with szeged looking good.
Gerhard Hoffmann
2023-12-05 17:31:56 +0100
de7a63bc2a
new test cases for regression tests
Gerhard Hoffmann
2023-12-05 17:30:12 +0100
73b1c1459e
added tariff for testing
Gerhard Hoffmann
2023-12-01 14:26:07 +0100
a599e47a47
Add test cases for szeged.
Gerhard Hoffmann
2023-12-01 14:25:06 +0100
e97ad17b09
removed typo
Gerhard Hoffmann
2023-12-01 14:24:51 +0100
19428ce46c
implemented both cost and duration functions. to be tested
Gerhard Hoffmann
2023-12-01 14:24:15 +0100
4c268e6693
Added draft implementation of private_GetDurationFromCost().
Gerhard Hoffmann
2023-11-28 16:43:03 +0100
cc5c52c1a0
Added private_getDurationFromCost()
Gerhard Hoffmann
2023-11-28 16:42:29 +0100
602ff5f94e
Added State for invalid price
Gerhard Hoffmann
2023-11-28 16:41:27 +0100
b8720bac6c
Added special days.
Gerhard Hoffmann
2023-11-28 16:40:41 +0100
64c005cd70
Implement private_GetCostFromDuration() using a loop and not using recursive calls.
Gerhard Hoffmann
2023-11-28 15:25:37 +0100
9abc165a7c
Implemented computeWeekDaysPrice() and computeWeekDaysDurationUnit()
Gerhard Hoffmann
2023-11-28 15:20:31 +0100
57ec82a2fc
Added helpers computeWeekDaysPrice() and computeWeekDaysDurationUnit()
Gerhard Hoffmann
2023-11-28 15:18:05 +0100
a49236c1de
Removed parameters in private_GetCostFromDuration() and checkDurationMinutes()
Gerhard Hoffmann
2023-11-28 15:17:27 +0100
9a19320ee5
Minor: removed debug output.
Gerhard Hoffmann
2023-11-28 15:15:13 +0100
9e8833f362
Added special days.
Gerhard Hoffmann
2023-11-28 15:14:35 +0100
7a5d797ae0
Start reimplementation of private_GetCostFromDuration() in terms of ticket.
Gerhard Hoffmann
2023-11-27 16:21:28 +0100
215667af61
Implement findWorkTimeRange() and indNextWorkTimeRange().
Gerhard Hoffmann
2023-11-27 16:19:39 +0100
2b6d116200
Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value.
Gerhard Hoffmann
2023-11-27 16:18:06 +0100
2d9ed3c1c8
testing ...
Gerhard Hoffmann
2023-11-27 16:16:50 +0100
9ca45e613f
Return a ticket from private_GetCostFromDuration(). Add helpers findWorkTimeRange() and findNextWorkTimeRange().
Gerhard Hoffmann
2023-11-27 16:15:18 +0100
6a3d183129
Minor: overload constructor
Gerhard Hoffmann
2023-11-27 16:14:27 +0100
684de4acd1
Reformat to Unix. Add overload for IsYearPeriodActive(). Add several helpers.
Gerhard Hoffmann
2023-11-27 16:12:07 +0100
e9047f995a
Minor: format to Unix.
Gerhard Hoffmann
2023-11-27 16:09:38 +0100
20cdb8b07f
Add overload for IsYearPeriodActive(). Add helpers WeekDaysWorkTimeFrom(), WeekDaysWorkTimeUntil(), isCarryOverSet() sCarryOverNotSet() and getPaymentMethodId().
Gerhard Hoffmann
2023-11-27 16:07:30 +0100
478d5a8ced
This branch is obsolete
schoenau
Siegfried Siegert
2023-11-27 10:13:31 +0100
9bfea0f46d
Add compute_next_timestep()
2.0.0
Siegfried Siegert
2023-11-27 08:59:51 +0100
b84970fd12
Add class Ticket for future use.
Gerhard Hoffmann
2023-11-26 19:56:38 +0100
7ac033720e
Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration().
Gerhard Hoffmann
2023-11-26 19:55:21 +0100
c749de2bf9
Add private_GetCostFromDuration() and helpers getMinimalParkingTime(), getMaximalParkingTime(), checkDurationMinutes().
Gerhard Hoffmann
2023-11-26 19:53:29 +0100
c4cec1c04b
Added overload for CheckSpecialDay(). Added helpers SpecialDaysWorkTimeFrom() and SpecialDaysWorkTimeUntil().
Gerhard Hoffmann
2023-11-26 19:51:37 +0100
a53cb37291
Add explicit include guard.
Gerhard Hoffmann
2023-11-26 19:50:23 +0100
b1a98a20c5
Add class ticket
Gerhard Hoffmann
2023-11-26 19:48:29 +0100
d765997ca5
dos2unix. add TODO comment
Gerhard Hoffmann
2023-11-24 13:52:49 +0100
d2664fdb95
add test json for neuhauser
Gerhard Hoffmann
2023-11-24 13:25:11 +0100
36478e111e
start changes for neuhauser
Gerhard Hoffmann
2023-11-24 13:23:59 +0100
7ee90a9e8a
Fix: GetDurationForPrice return proper value not only '0'
Siegfried Siegert
2023-11-23 15:06:57 +0100
8f2609c4ae
Fix: GetDurationFromCost for PaymentMethod::Steps
Siegfried Siegert
2023-11-23 11:14:21 +0100
453ca266a5
Merge remote-tracking branch 'origin/schoenau_23112023'
Siegfried Siegert
2023-11-23 09:46:42 +0100
0217bb8918
GetTimeStep() and GetPriceForTimeStep(): use getPaymentOptions().
schoenau_23112023
Gerhard Hoffmann
2023-11-23 09:41:40 +0100
4b35b1ffb7
Implement GetDurationForPrice().
Gerhard Hoffmann
2023-11-23 09:41:02 +0100
80e228b498
GetCostFromDuration(): don't use condiftion PaymentMethod::Steps, but the multimap YearPeriod, which must be empty.
Gerhard Hoffmann
2023-11-23 09:39:26 +0100
574161ff76
Call getDurationForPrice() in GetDurationForCost().
Gerhard Hoffmann
2023-11-23 09:38:34 +0100
b80cd5e6ef
Remove parameter paymentMethod. Add GetDurationForPrice().
Gerhard Hoffmann
2023-11-23 09:36:50 +0100
ccbf07a654
Use new getPaymentOptions interface
Siegfried Siegert
2023-11-23 08:42:35 +0100
3a2e521345
Add interface to access 'PaymentOptions'
Siegfried Siegert
2023-11-22 16:27:41 +0100
cd77e380ef
Read project/version-info from tariff-config ...
Siegfried Siegert
2023-11-22 11:27:09 +0100
aaa4348a9a
Add ATBProject to configuration
Gerhard Hoffmann
2023-10-11 15:42:31 +0200
17c4aac452
Add header file atb_project.h
Gerhard Hoffmann
2023-10-11 15:43:13 +0200
68c438bfe0
Add header file for project-variables
Gerhard Hoffmann
2023-10-11 15:46:06 +0200
509bc29d7e
Fix: read tariff configuration file
Siegfried Siegert
2023-11-22 10:17:40 +0100
f7e462188f
Add methods for PaymentMethod::Steps
Siegfried Siegert
2023-11-22 08:55:00 +0100
00bf13af86
Set payment method to 4 (steps). Removed any special days. Added tariff03.json for maybe zone_3 in Schoenau.
Gerhard Hoffmann
2023-11-07 14:46:09 +0100
062d936042
Minor: Added OTHERFILES
Gerhard Hoffmann
2023-11-07 14:45:03 +0100
86c27986cc
Added sone test code for Schoenau, Koenigsee.
Gerhard Hoffmann
2023-11-07 14:44:23 +0100
10b018a338
Lower restrictions when parsing json-files (needed for Schoenau, as there are no special days.)
Gerhard Hoffmann
2023-11-07 14:43:26 +0100
1c13a705c8
Implemented GetCostFromDuration() for tariffs with step-structure and no special days
Gerhard Hoffmann
2023-11-07 14:41:45 +0100
fd5b41364a
Added GetCostFromDuration()-functions: to be used for tariffs with only steps and no special days. Example: Schoenu, Koenigsee.
Gerhard Hoffmann
2023-11-07 14:39:13 +0100
cb78e27d37
Re-Test.
Gerhard Hoffmann
2023-10-11 15:49:45 +0200
ff1dc4a10c
Add header file for project-variables
Gerhard Hoffmann
2023-10-11 15:46:06 +0200
9d9fbc91f9
Read Project, Version and Info fields from json-tariff-files
Gerhard Hoffmann
2023-10-11 15:45:27 +0200
e0ccec1ff2
Add header file atb_project.h
Gerhard Hoffmann
2023-10-11 15:43:13 +0200
2974734642
Add ATBProject to configuration
Gerhard Hoffmann
2023-10-11 15:42:31 +0200
6ea2ea7df7
Use helper functions GetTimeStep() and GetPriceForTimeStep() inside of GetCostFromDuration().
Gerhard Hoffmann
2023-10-11 15:41:02 +0200
7508cb6c45
Add helper functions GetTimeSteps() and GetPriceForTimeSteps().
Gerhard Hoffmann
2023-10-11 15:40:13 +0200
4925870227
Add helper functions for Schoenau: GetTimeSteps(0 and GetPriceForTimeStep().
Gerhard Hoffmann
2023-10-11 15:38:35 +0200
c310f7a06d
test cases for schoenau
Gerhard Hoffmann
2023-10-11 15:37:35 +0200
e99612fed9
draft for tariff files of schoenau
Gerhard Hoffmann
2023-10-11 15:36:40 +0200
8e1ef45b3f
remove obsolete files
Gerhard Hoffmann
2023-10-11 15:35:50 +0200
6ea58be34d
24-hour ticket
moransBranch
Moran Rod
2023-08-22 12:26:52 +0200
8a7828c1e6
24-hour ticket
Moran Rod
2023-08-22 12:16:25 +0200
d15c9dad29
Update tariff04 (virtual dayticket)
1.0.0
Siegfried Siegert
2023-06-27 17:43:58 +0200
cb8cd5dead
Merge branch 'moransBranch'
Siegfried Siegert
2023-06-14 11:28:27 +0200
9d64350e4f
Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
Siegfried Siegert
2023-06-14 11:27:43 +0200
1a71edc274
max_time=300, unit_id=1
Gerhard Hoffmann
2023-06-13 13:32:16 +0200
51d8beda2a
max_time=300, unit_id=1
Gerhard Hoffmann
2023-06-13 13:32:12 +0200
7bab9d6ba2
max_time=300, unit_id=1
Gerhard Hoffmann
2023-06-13 13:32:08 +0200
8b4d64bd0c
max_time=300, unit_id=1
Gerhard Hoffmann
2023-06-13 13:31:42 +0200
eefdde4693
Removed section whith superfluous 'price_per_unit < 0' check. Removed calc_price-caculation followed by shift of inputDate.
Gerhard Hoffmann
2023-06-13 12:12:23 +0200
6157861d62
Monday starts with 1
Gerhard Hoffmann
2023-06-13 12:11:09 +0200
23748966de
Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch
Siegfried Siegert
2023-05-19 15:49:38 +0200
7bd7f66666
Fixed pra_payment_unit_id
Moran Rod
2023-05-17 10:08:02 +0200
268d43cdea
GetDailyTicketDuration: use QDateTime for timestamps
Siegfried Siegert
2023-05-16 16:43:45 +0200
a453886f0a
Merge branch 'master' into moransBranch
Siegfried Siegert
2023-05-16 15:35:47 +0200
eef94a3fb3
Change interface: use QDateTime
Siegfried Siegert
2023-05-16 15:31:53 +0200