Commit Graph

Select branches

Hide Pull Requests

bad-neuenahr-ahrweiler

fix-galtuer

fix-kirchdorf

fix-kirchdorf2

fuchs-experimental

fuchs-muehlbach

kleipeda

kleipeda-experimental

kleipeda-experimental-snapshot-2024-09-12

kleipeda-experimental-snapshot-2024-09-27

master

moransBranch

neuhauser-bilexa-galtuer

neuhauser-kirchdorf

neuhauser-linsinger-maschinenbau

neuhauser-nordisches-ausbildungszentrum

neuhauser_korneuburg

remotes/origin/kleipeda-experimental-snapshot-2024-10-21

schoenau

schoenau_23112023

vorkauf-fix-2025-April-22

0.0.1

0.0.2

1.0.0

2.0.0

2.0.2

2.0.3

2.1.0

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.2.0

2.2.1

2.3.0

2.3.1

2.3.99-10

2.3.99-11

2.3.99-12

2.3.99-13

2.3.99-14

2.3.99-15

2.3.99-16

2.3.99-17

2.3.99-18

2.3.99-19

2.3.99-2

2.3.99-20

2.3.99-21

2.3.99-23

2.3.99-24

2.4.0

2.5.0

Neuhauser-Kirchdorf

bad-neuenahr-standard-tariff

galtuer-fix

stockerau

v1.0.0

v2

Mono Color

• 9d220df52e Mainly removed debug output. Regression tests with szeged looking good. Gerhard Hoffmann 2023-12-05 17:31:56 +01:00
• de7a63bc2a new test cases for regression tests Gerhard Hoffmann 2023-12-05 17:30:12 +01:00
• 73b1c1459e added tariff for testing Gerhard Hoffmann 2023-12-01 14:26:07 +01:00
• a599e47a47 Add test cases for szeged. Gerhard Hoffmann 2023-12-01 14:25:06 +01:00
• e97ad17b09 removed typo Gerhard Hoffmann 2023-12-01 14:24:51 +01:00
• 19428ce46c implemented both cost and duration functions. to be tested Gerhard Hoffmann 2023-12-01 14:24:15 +01:00
• 4c268e6693 Added draft implementation of private_GetDurationFromCost(). Gerhard Hoffmann 2023-11-28 16:43:03 +01:00
• cc5c52c1a0 Added private_getDurationFromCost() Gerhard Hoffmann 2023-11-28 16:42:29 +01:00
• 602ff5f94e Added State for invalid price Gerhard Hoffmann 2023-11-28 16:41:27 +01:00
• b8720bac6c Added special days. Gerhard Hoffmann 2023-11-28 16:40:41 +01:00
• 64c005cd70 Implement private_GetCostFromDuration() using a loop and not using recursive calls. Gerhard Hoffmann 2023-11-28 15:25:37 +01:00
• 9abc165a7c Implemented computeWeekDaysPrice() and computeWeekDaysDurationUnit() Gerhard Hoffmann 2023-11-28 15:20:31 +01:00
• 57ec82a2fc Added helpers computeWeekDaysPrice() and computeWeekDaysDurationUnit() Gerhard Hoffmann 2023-11-28 15:18:05 +01:00
• a49236c1de Removed parameters in private_GetCostFromDuration() and checkDurationMinutes() Gerhard Hoffmann 2023-11-28 15:17:27 +01:00
• 9a19320ee5 Minor: removed debug output. Gerhard Hoffmann 2023-11-28 15:15:13 +01:00
• 9e8833f362 Added special days. Gerhard Hoffmann 2023-11-28 15:14:35 +01:00
• 7a5d797ae0 Start reimplementation of private_GetCostFromDuration() in terms of ticket. Gerhard Hoffmann 2023-11-27 16:21:28 +01:00
• 215667af61 Implement findWorkTimeRange() and indNextWorkTimeRange(). Gerhard Hoffmann 2023-11-27 16:19:39 +01:00
• 2b6d116200 Implement GetCostFromDuration() in terms of private_GetCostFromDuration() using a ticket as return value. Gerhard Hoffmann 2023-11-27 16:18:06 +01:00
• 2d9ed3c1c8 testing ... Gerhard Hoffmann 2023-11-27 16:16:50 +01:00
• 9ca45e613f Return a ticket from private_GetCostFromDuration(). Add helpers findWorkTimeRange() and findNextWorkTimeRange(). Gerhard Hoffmann 2023-11-27 16:15:18 +01:00
• 6a3d183129 Minor: overload constructor Gerhard Hoffmann 2023-11-27 16:14:27 +01:00
• 684de4acd1 Reformat to Unix. Add overload for IsYearPeriodActive(). Add several helpers. Gerhard Hoffmann 2023-11-27 16:12:07 +01:00
• e9047f995a Minor: format to Unix. Gerhard Hoffmann 2023-11-27 16:09:38 +01:00
• 20cdb8b07f Add overload for IsYearPeriodActive(). Add helpers WeekDaysWorkTimeFrom(), WeekDaysWorkTimeUntil(), isCarryOverSet() sCarryOverNotSet() and getPaymentMethodId(). Gerhard Hoffmann 2023-11-27 16:07:30 +01:00
• 478d5a8ced
  
  This branch is obsolete schoenau Siegfried Siegert 2023-11-27 10:13:31 +01:00
• 9bfea0f46d
  
  Add compute_next_timestep() 2.0.0 Siegfried Siegert 2023-11-27 08:59:51 +01:00
• b84970fd12 Add class Ticket for future use. Gerhard Hoffmann 2023-11-26 19:56:38 +01:00
• 7ac033720e Started re-implementation of GetCostFromDuration() using private_GetCostFromDuration(). Gerhard Hoffmann 2023-11-26 19:55:21 +01:00
• c749de2bf9 Add private_GetCostFromDuration() and helpers getMinimalParkingTime(), getMaximalParkingTime(), checkDurationMinutes(). Gerhard Hoffmann 2023-11-26 19:53:29 +01:00
• c4cec1c04b Added overload for CheckSpecialDay(). Added helpers SpecialDaysWorkTimeFrom() and SpecialDaysWorkTimeUntil(). Gerhard Hoffmann 2023-11-26 19:51:37 +01:00
• a53cb37291 Add explicit include guard. Gerhard Hoffmann 2023-11-26 19:50:23 +01:00
• b1a98a20c5 Add class ticket Gerhard Hoffmann 2023-11-26 19:48:29 +01:00
• d765997ca5 dos2unix. add TODO comment Gerhard Hoffmann 2023-11-24 13:52:49 +01:00
• d2664fdb95 add test json for neuhauser Gerhard Hoffmann 2023-11-24 13:25:11 +01:00
• 36478e111e start changes for neuhauser Gerhard Hoffmann 2023-11-24 13:23:59 +01:00
• 7ee90a9e8a
  
  Fix: GetDurationForPrice return proper value not only '0' Siegfried Siegert 2023-11-23 15:06:57 +01:00
• 8f2609c4ae
  
  Fix: GetDurationFromCost for PaymentMethod::Steps Siegfried Siegert 2023-11-23 11:14:21 +01:00
• 453ca266a5
  
  Merge remote-tracking branch 'origin/schoenau_23112023' Siegfried Siegert 2023-11-23 09:46:42 +01:00
• 0217bb8918 GetTimeStep() and GetPriceForTimeStep(): use getPaymentOptions(). schoenau_23112023 Gerhard Hoffmann 2023-11-23 09:41:40 +01:00
• 4b35b1ffb7 Implement GetDurationForPrice(). Gerhard Hoffmann 2023-11-23 09:41:02 +01:00
• 80e228b498 GetCostFromDuration(): don't use condiftion PaymentMethod::Steps, but the multimap YearPeriod, which must be empty. Gerhard Hoffmann 2023-11-23 09:39:26 +01:00
• 574161ff76 Call getDurationForPrice() in GetDurationForCost(). Gerhard Hoffmann 2023-11-23 09:38:34 +01:00
• b80cd5e6ef Remove parameter paymentMethod. Add GetDurationForPrice(). Gerhard Hoffmann 2023-11-23 09:36:50 +01:00
• ccbf07a654
  
  Use new getPaymentOptions interface Siegfried Siegert 2023-11-23 08:42:35 +01:00
• 3a2e521345
  
  Add interface to access 'PaymentOptions' Siegfried Siegert 2023-11-22 16:27:41 +01:00
• cd77e380ef
  
  Read project/version-info from tariff-config ... Siegfried Siegert 2023-11-22 11:27:09 +01:00
• aaa4348a9a
  
  Add ATBProject to configuration Gerhard Hoffmann 2023-10-11 15:42:31 +02:00
• 17c4aac452
  
  Add header file atb_project.h Gerhard Hoffmann 2023-10-11 15:43:13 +02:00
• 68c438bfe0
  
  Add header file for project-variables Gerhard Hoffmann 2023-10-11 15:46:06 +02:00
• 509bc29d7e
  
  Fix: read tariff configuration file Siegfried Siegert 2023-11-22 10:17:40 +01:00
• f7e462188f
  
  Add methods for PaymentMethod::Steps Siegfried Siegert 2023-11-22 08:55:00 +01:00
• 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 +01:00
• 062d936042 Minor: Added OTHERFILES Gerhard Hoffmann 2023-11-07 14:45:03 +01:00
• 86c27986cc Added sone test code for Schoenau, Koenigsee. Gerhard Hoffmann 2023-11-07 14:44:23 +01:00
• 10b018a338 Lower restrictions when parsing json-files (needed for Schoenau, as there are no special days.) Gerhard Hoffmann 2023-11-07 14:43:26 +01:00
• 1c13a705c8 Implemented GetCostFromDuration() for tariffs with step-structure and no special days Gerhard Hoffmann 2023-11-07 14:41:45 +01:00
• 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 +01:00
• cb78e27d37 Re-Test. Gerhard Hoffmann 2023-10-11 15:49:45 +02:00
• ff1dc4a10c Add header file for project-variables Gerhard Hoffmann 2023-10-11 15:46:06 +02:00
• 9d9fbc91f9 Read Project, Version and Info fields from json-tariff-files Gerhard Hoffmann 2023-10-11 15:45:27 +02:00
• e0ccec1ff2 Add header file atb_project.h Gerhard Hoffmann 2023-10-11 15:43:13 +02:00
• 2974734642 Add ATBProject to configuration Gerhard Hoffmann 2023-10-11 15:42:31 +02:00
• 6ea2ea7df7 Use helper functions GetTimeStep() and GetPriceForTimeStep() inside of GetCostFromDuration(). Gerhard Hoffmann 2023-10-11 15:41:02 +02:00
• 7508cb6c45 Add helper functions GetTimeSteps() and GetPriceForTimeSteps(). Gerhard Hoffmann 2023-10-11 15:40:13 +02:00
• 4925870227 Add helper functions for Schoenau: GetTimeSteps(0 and GetPriceForTimeStep(). Gerhard Hoffmann 2023-10-11 15:38:35 +02:00
• c310f7a06d test cases for schoenau Gerhard Hoffmann 2023-10-11 15:37:35 +02:00
• e99612fed9 draft for tariff files of schoenau Gerhard Hoffmann 2023-10-11 15:36:40 +02:00
• 8e1ef45b3f remove obsolete files Gerhard Hoffmann 2023-10-11 15:35:50 +02:00
• 6ea58be34d 24-hour ticket moransBranch Moran Rod 2023-08-22 12:26:52 +02:00
• 8a7828c1e6 24-hour ticket Moran Rod 2023-08-22 12:16:25 +02:00
• d15c9dad29
  
  Update tariff04 (virtual dayticket) 1.0.0 Siegfried Siegert 2023-06-27 17:43:58 +02:00
• cb8cd5dead
  
  Merge branch 'moransBranch' Siegfried Siegert 2023-06-14 11:28:27 +02:00
• 9d64350e4f
  
  Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch Siegfried Siegert 2023-06-14 11:27:43 +02:00
• 1a71edc274 max_time=300, unit_id=1 Gerhard Hoffmann 2023-06-13 13:32:16 +02:00
• 51d8beda2a max_time=300, unit_id=1 Gerhard Hoffmann 2023-06-13 13:32:12 +02:00
• 7bab9d6ba2 max_time=300, unit_id=1 Gerhard Hoffmann 2023-06-13 13:32:08 +02:00
• 8b4d64bd0c max_time=300, unit_id=1 Gerhard Hoffmann 2023-06-13 13:31:42 +02:00
• 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 +02:00
• 6157861d62 Monday starts with 1 Gerhard Hoffmann 2023-06-13 12:11:09 +02:00
• 23748966de
  
  Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch Siegfried Siegert 2023-05-19 15:49:38 +02:00
• 7bd7f66666 Fixed pra_payment_unit_id Moran Rod 2023-05-17 10:08:02 +02:00
• 268d43cdea
  
  GetDailyTicketDuration: use QDateTime for timestamps Siegfried Siegert 2023-05-16 16:43:45 +02:00
• a453886f0a
  
  Merge branch 'master' into moransBranch Siegfried Siegert 2023-05-16 15:35:47 +02:00
• eef94a3fb3
  
  Change interface: use QDateTime Siegfried Siegert 2023-05-16 15:31:53 +02:00
• 88a0b6ebe2
  
  Make main.c compile again Siegfried Siegert 2023-05-16 11:10:49 +02:00
• 3097819c01
  
  Update interface for 'compute_duration_for_daily_ticket() Siegfried Siegert 2023-05-16 11:07:21 +02:00
• acf799da7e
  
  Add explaining comments Siegfried Siegert 2023-05-15 16:58:28 +02:00
• 3bf71f84d5
  
  Merge branch 'moransBranch' Siegfried Siegert 2023-05-15 17:33:51 +02:00
• 73f5eca656
  
  Tariff config: add day ticket Siegfried Siegert 2023-05-15 17:23:10 +02:00
• b8753cc2ed
  
  Update tariff config for test Siegfried Siegert 2023-05-15 17:06:57 +02:00
• 29986e0451
  
  Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch Siegfried Siegert 2023-05-15 16:58:48 +02:00
• 1146db743c
  
  Add explaining comments Siegfried Siegert 2023-05-15 16:58:28 +02:00
• c6302edec5
  
  Format all json files Siegfried Siegert 2023-05-15 16:57:45 +02:00
• 617eee39ed Daily ticket Moran Rod 2023-05-15 14:05:55 +02:00
• 6b3c1cbf0c Fix with min time in GetDurationFromCost Moran Rod 2023-05-14 17:19:24 +02:00
• 1142efaec2 Rounding minutes seems to be fixed ... Moran Rod 2023-05-14 16:15:37 +02:00
• 90eae152bf
  
  Merge branch 'moransBranch' 0.0.2 Siegfried Siegert 2023-05-12 14:48:19 +02:00
• 6d001f1501
  
  Fix: QDateTime.addSecs() creates a new object Siegfried Siegert 2023-05-12 14:28:30 +02:00
• de32022b89
  
  Merge branch 'moransBranch' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into moransBranch Siegfried Siegert 2023-05-12 14:10:57 +02:00