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

• b43fa274bd Implement get_minimal_parkingtime() and get_time_steps(). Gerhard Hoffmann 2024-01-22 15:41:20 +01:00
• 0ce630dfa3 Add get_minimum_parkingtime() Gerhard Hoffmann 2024-01-22 15:39:47 +01:00
• 0671a6dde6 Add get_time_steps(). Gerhard Hoffmann 2024-01-22 14:46:40 +01:00
• d7757773bd Implement get_calculator() Gerhard Hoffmann 2024-01-22 14:29:02 +01:00
• 99a3c34d53 forward declare class Calculator Gerhard Hoffmann 2024-01-22 14:28:22 +01:00
• 6ce8a86c5f Added get_calculator(): access for Calculator instance Gerhard Hoffmann 2024-01-22 14:26:57 +01:00
• bcd5aaf932 Minor: add debug output Gerhard Hoffmann 2024-01-22 13:41:50 +01:00
• acb88efc5a re-add 'private' Gerhard Hoffmann 2024-01-22 13:37:44 +01:00
• e9b10166d2 Minor: implement getPaymentOptions() for const. Add getPaymentOptions() for non-const Gerhard Hoffmann 2024-01-22 13:33:23 +01:00
• 33731faba9 GetTimeSteps(): compute minimal parking time and set pop_min_time. Gerhard Hoffmann 2024-01-22 13:31:00 +01:00
• 15700a363d Remove m_start member. Add defualt parameter start for GetTimeSteps(). Gerhard Hoffmann 2024-01-22 13:28:38 +01:00
• 506a665592 provide GetPaymentOptions() with two signatures. Gerhard Hoffmann 2024-01-22 13:27:21 +01:00
• 7679eb9481
  
  Remove 'VERSION' in project file ... Siegfried Siegert 2024-01-22 10:50:59 +01:00
• a8de97a528 Initialize TimeBase multimap. Gerhard Hoffmann 2024-01-22 10:24:32 +01:00
• ed6592c273 Add: multimap<int, ATBTimeBase> TimeBase Gerhard Hoffmann 2024-01-22 10:23:41 +01:00
• cc702a413e Minor: add compile switches -g -O v1.0.0 Gerhard Hoffmann 2024-01-18 15:05:15 +01:00
• 51a58bfa15 Minor: Add VERSION variable Gerhard Hoffmann 2024-01-18 15:03:24 +01:00
• ff314c810f Add TimeBase to configuration object. Gerhard Hoffmann 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)). Gerhard Hoffmann 2024-01-18 14:57:04 +01:00
• 89e0f2137b Add handling of pun_duration_min and pun_duration_max Gerhard Hoffmann 2024-01-18 14:56:20 +01:00
• f68d8816c0 Add handling of pop_carry_over_time_range_id and pop_time_step_config. Gerhard Hoffmann 2024-01-18 14:55:16 +01:00
• 7ce93ddd7a Extend handling of TimeRangeType. Gerhard Hoffmann 2024-01-18 14:53:57 +01:00
• 7f8ed9165d Add handling for TimeStepConfig. Gerhard Hoffmann 2024-01-18 14:53:01 +01:00
• 0b901954aa Add members m_start and m_timeStepCompensation (used for Neuhauser, Galtuer (745) at the moment). Add several setters/getters. Gerhard Hoffmann 2024-01-18 14:49:56 +01:00
• 9f4b10bb9a Add and fill multimap<int, ATBTimeRange> TimeRange; multimap<int, ATBTimeStepConfig> TimeStepConfig; when parsing json-file. Gerhard Hoffmann 2024-01-18 14:43:08 +01:00
• 2f939d607d Add include/mobilisis/tariff_timebase.h include/mobilisis/tariff_timestep_config.h Gerhard Hoffmann 2024-01-18 14:41:54 +01:00
• 283e970be4 Add pun_duration_min and pun_duration_max Gerhard Hoffmann 2024-01-18 14:41:12 +01:00
• e14edea07f Add TimeRangeType and TimeStepConfigType. Gerhard Hoffmann 2024-01-18 14:39:57 +01:00
• e520965c6b Add pop_carry_over_time_range_id and pop_time_step_config Gerhard Hoffmann 2024-01-18 14:38:13 +01:00
• 6a781f0d3b Minor: add debug output Gerhard Hoffmann 2024-01-18 14:37:13 +01:00
• c357cbbbe0 Add descrption file for tariff time step config Gerhard Hoffmann 2024-01-18 14:36:28 +01:00
• b4940e98fe Add test for NEUHAUSER_BILEXA_GALTUER Gerhard Hoffmann 2024-01-18 14:34:57 +01:00
• b8a5803613 Add tariff-file for galtuer. Gerhard Hoffmann 2024-01-18 14:33:44 +01:00
• 6a79c6c463 Adapt TimeBase description. Gerhard Hoffmann 2024-01-18 14:32:32 +01:00
• 528b3882a0 renamed Gerhard Hoffmann 2024-01-17 08:23:19 +01:00
• 7d274f807e delete useless files Gerhard Hoffmann 2024-01-17 08:21:08 +01:00
• e977665649 delete useless files Gerhard Hoffmann 2024-01-17 08:19:37 +01:00
• 44a94b7007 Minor: add comment Gerhard Hoffmann 2024-01-16 11:56:54 +01:00
• 7c13d8b88c Added pun_duration_min and pun_duration_max in case we dont have to pay for a full time range Gerhard Hoffmann 2024-01-16 11:56:12 +01:00
• 64bc639eaa delete (useless) Gerhard Hoffmann 2024-01-07 16:09:16 +01:00
• f0312bc8fb another books Gerhard Hoffmann 2023-12-22 13:19:06 +01:00
• 37052e97fc Add some vue books/docs. Gerhard Hoffmann 2023-12-21 15:49:35 +01:00
• 8cf816c158 Add testcases for naz Gerhard Hoffmann 2023-12-15 13:28:58 +01:00
• f1f5ac8900 Add operator << for printing Gerhard Hoffmann 2023-12-15 13:28:34 +01:00
• ddded411aa Add operator << for printing Gerhard Hoffmann 2023-12-15 13:28:19 +01:00
• 96587229e2 Add operator << for printing Gerhard Hoffmann 2023-12-15 13:28:04 +01:00
• 3d3794ea4e Add multimap for dailly ticket.w Gerhard Hoffmann 2023-12-15 13:27:02 +01:00
• bb83ae3074 Fix: add a 'break' in swich/case. Gerhard Hoffmann 2023-12-15 13:25:09 +01:00
• c598014dd0 Add parsing of Gerhard Hoffmann 2023-12-15 13:24:29 +01:00
• ad534eef09 Add 4 new data type for IdentifyJsonMember(). Gerhard Hoffmann 2023-12-15 13:22:49 +01:00
• 5ee73bf804 IdentifyJsonMember(): add 4 new data types: DailyTicket, TimeBase, Customer and TimeRange. Gerhard Hoffmann 2023-12-15 13:20:42 +01:00
• ef7fff79c9 draft for tarif in naz Gerhard Hoffmann 2023-12-15 13:18:12 +01:00
• ea2dfa144f Add new menber types: dailly ticket, timebase, time range and customer. Gerhard Hoffmann 2023-12-12 17:56:26 +01:00
• f56979a61a Minor: rename to ATBCustomer. Gerhard Hoffmann 2023-12-12 17:55:44 +01:00
• cc07b8f20e Minor: rename to ATBTimeBase Gerhard Hoffmann 2023-12-12 17:55:06 +01:00
• 81459f7ab4 Minor: remove 'pragma onc' Gerhard Hoffmann 2023-12-12 17:50:23 +01:00
• db7fe35095 Add some new ideas. Gerhard Hoffmann 2023-12-12 12:14:54 +01:00
• 08e89df5a5 Include 3 new header files. Gerhard Hoffmann 2023-12-12 12:14:34 +01:00
• d6324f03a8 Add drafts for 3 new haeder files. Gerhard Hoffmann 2023-12-12 12:14:14 +01:00
• 2b3ee3f384 Renamed again. Gerhard Hoffmann 2023-12-12 12:11:32 +01:00
• 08f8f3a9fd "" Gerhard Hoffmann 2023-12-12 12:10:55 +01:00
• a80bc7294a Removed tartiff_csutomer. Gerhard Hoffmann 2023-12-12 12:00:04 +01:00
• 3a0baf266b Add first draft. Gerhard Hoffmann 2023-12-12 11:59:35 +01:00
• 31193336cf Define daily ticket structure. Gerhard Hoffmann 2023-12-12 11:53:22 +01:00
• 4fbc2c502b Header for definition of daily ticket. Gerhard Hoffmann 2023-12-12 11:36:58 +01:00
• 8d7d175b51 GetDailyTicketDuration(): replace ZellersAlgorithm by qts build in method dayOfWeek(). Gerhard Hoffmann 2023-12-12 11:34:04 +01:00
• ebb5bad7c5 Minor: replace call to LOG_ERROR() using qCritical(). Gerhard Hoffmann 2023-12-12 11:30:30 +01:00
• b122206a94 Minor add some json files under OTHER_FILES for documentation. Gerhard Hoffmann 2023-12-12 11:08:10 +01:00
• 83807a0f99 Add tariff-files for documentation under OTHERFILES. Gerhard Hoffmann 2023-12-12 11:05:13 +01:00
• d0e0699906 Add tests for linsinger maschinenbau. neuhauser-linsinger-maschinenbau Gerhard Hoffmann 2023-12-12 10:59:49 +01:00
• 3006e64b37 private_GetDurationFromCost(): Gerhard Hoffmann 2023-12-12 10:58:08 +01:00
• c8218bd7af private_GetDurationFromCost(): Gerhard Hoffmann 2023-12-12 10:56:58 +01:00
• ba3dfcd3d6 Minor: private_GetCostFromDuration(): define static variables using helpers moved to namespace Utilities. Gerhard Hoffmann 2023-12-12 10:55:19 +01:00
• c51d350618 Minor: Moved Gerhard Hoffmann 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. Gerhard Hoffmann 2023-12-12 10:52:16 +01:00
• 67b12f4b33 Private GetCostFromDuration() and GetCostFromDuration() helpers: Gerhard Hoffmann 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. Gerhard Hoffmann 2023-12-12 10:43:16 +01:00
• d4e03a51dd Moved uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) const; double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) const; to namespace Utilities. Gerhard Hoffmann 2023-12-12 10:41:21 +01:00
• 723b3530cc Added helpers GetPriceForStep() and GetStepForPrice() to make source more readable. Gerhard Hoffmann 2023-12-12 10:40:20 +01:00
• 63f508fb95 Moved Gerhard Hoffmann 2023-12-12 10:38:31 +01:00
• 6e0a74c8cc Add helpers GetSteps(), noSpecialDays(), specialDays() and tariffIs24_7() to make the source more readable. Gerhard Hoffmann 2023-12-12 10:36:22 +01:00
• d11cffb8bd Set pop_business_hours when parsing json-tariff-file. Gerhard Hoffmann 2023-12-12 10:34:39 +01:00
• 15f552a973 Minor: Add header tariff_business_hours.h Gerhard Hoffmann 2023-12-12 10:33:03 +01:00
• 52ad1c3ba8 Minor: add constructor taking some parameters.. Gerhard Hoffmann 2023-12-12 10:31:54 +01:00
• 43b8a8d3bf Add member pop_business_hours. Add default constructor. Gerhard Hoffmann 2023-12-12 10:30:55 +01:00
• ceef73195d Add helper structure Gerhard Hoffmann 2023-12-12 10:26:13 +01:00
• 282a412ef5 IsYearPeriodActive(): return true, even if no YearPeriod is given in tariff-json-file. Gerhard Hoffmann 2023-12-12 10:23:45 +01:00
• 9dcf7a8f30 Implement added helpers. Gerhard Hoffmann 2023-12-12 10:22:34 +01:00
• 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 +01:00
• 88e92dddb9 Fix: nextTimeStep must be between minParkingTime and maxParkingTime. neuhauser_korneuburg Gerhard Hoffmann 2023-12-11 09:00:24 +01:00
• 0f05a1a784 (1) Fix debug output. (2) Use UpDown-Argument for calculation of next tiem step. Gerhard Hoffmann 2023-12-08 10:16:52 +01:00
• 2d696941a5 Fix: use second.pun_duration instead of second.pun_id Minor: add debug output. Gerhard Hoffmann 2023-12-08 10:14:48 +01:00
• 5598b02816 Make distinction base on PaymentMethod, not on some other data contained in json-tariff-file. Gerhard Hoffmann 2023-12-07 17:00:28 +01:00
• 548447af1f set -O option to calm down compiler because of FORTIFY_SOURCE=2 option Gerhard Hoffmann 2023-12-07 17:00:03 +01:00
• 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 +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); Gerhard Hoffmann 2023-12-07 16:27:09 +01:00
• 56e2843ddb Add compute_next_timestep(). Gerhard Hoffmann 2023-12-07 16:26:09 +01:00
• 6b76c4c2dd Add test cases for neuhauser. Gerhard Hoffmann 2023-12-06 10:52:35 +01:00
• 54e9a0f86d Minor: add debug ouput (and commnt it out) Gerhard Hoffmann 2023-12-06 10:51:46 +01:00
• d7beb3b41b Fix: replace 'continue' with 'break' to return first fitting time-range in findNextWorkTimeRange(). Gerhard Hoffmann 2023-12-06 10:49:33 +01:00