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

• b741d2e312 test fix-kirchdorf Gerhard Hoffmann 2024-02-26 16:57:37 +01:00
• 6756aa5b88 Added zone3 - zone6 to szeged Gerhard Hoffmann 2024-02-24 11:07:04 +01:00
• 7845ab8077 testing: started with zone 3 for szeged Gerhard Hoffmann 2024-02-23 14:20:16 +01:00
• cc222c298a Add test case for szeged: zone 2 Gerhard Hoffmann 2024-02-23 13:54:31 +01:00
• eb645273cc Add declaration for get_maximal_parkingprice() Gerhard Hoffmann 2024-02-23 13:17:03 +01:00
• bd1bdf8a8c Implement compute_procuct_price() Gerhard Hoffmann 2024-02-22 16:38:41 +01:00
• 6d18ce4caa GetDailyTicketPrice(): improve for projects which have not defined a daily ticket in their tariff-files. Gerhard Hoffmann 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; Gerhard Hoffmann 2024-02-22 16:34:57 +01:00
• afb0e20dd2 Implement parsing of "Product" and adding into TariffProduct. Gerhard Hoffmann 2024-02-22 16:33:19 +01:00
• 39ab08a5b7 Add ProductType Gerhard Hoffmann 2024-02-22 16:32:16 +01:00
• c4c0e2fd77 Added TariffProduct including necessary functions to retrieve product infos from tariff-file Gerhard Hoffmann 2024-02-22 16:31:51 +01:00
• 7a5487aa41 Add compute_product_price Gerhard Hoffmann 2024-02-22 16:27:52 +01:00
• a8c1caf611 Add tariff_product.h and tariff_permit_type.h Gerhard Hoffmann 2024-02-22 16:26:09 +01:00
• a22145002c Add test case for NAZ Gerhard Hoffmann 2024-02-22 16:25:30 +01:00
• 7b7dd6d103 Add representations for PERMIT_TYPE and Product Gerhard Hoffmann 2024-02-22 16:25:09 +01:00
• 1c801f1053 re-tested neuhauser-linisinger-maschinenbau Gerhard Hoffmann 2024-02-22 09:44:35 +01:00
• 56fc95e33c GetDurationFromCost(): reverted, as there is a new default parameter (prepaid) in compute_price_for_parming_ticket(). Gerhard Hoffmann 2024-02-22 09:43:04 +01:00
• c0f81f174a compute_price_for_parking_ticket(): added parameter bool prepaid. Set to true as default. Gerhard Hoffmann 2024-02-22 09:42:02 +01:00
• 6ba3963f25 compute_price_for_parking_ticket(): added default parameter prepaid=true. (Needed e.g. for Neuhauser/Linsinger Maschinenbau (741) Gerhard Hoffmann 2024-02-22 09:40:27 +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. Gerhard Hoffmann 2024-02-22 09:31:41 +01:00
• 15801be88e re-tested neuhauser-naz Gerhard Hoffmann 2024-02-22 09:30:15 +01:00
• 20e146d3c9 re-tested neuhauser-naz Gerhard Hoffmann 2024-02-22 09:10:26 +01:00
• 30768c6931 prepared test case for neuhauser-kirchdorf Gerhard Hoffmann 2024-02-22 08:02:55 +01:00
• 7933c826e6 Synced GetDurationFromCost() with GetCostFromDuration() Gerhard Hoffmann 2024-02-21 14:53:06 +01:00
• 9d5ddfc328 GetCostFromDuration(): fixed moving from time range 8:00-12:00 -> 14:00-18:00. 2.1.0 Gerhard Hoffmann 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. Gerhard Hoffmann 2024-02-21 11:16:44 +01:00
• 81d515eb7f GetCostFromDuration(): set endtime to start in case cost==0. Gerhard Hoffmann 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. Gerhard Hoffmann 2024-02-21 11:11:09 +01:00
• b6a0f5e8af tests for neuhauser/kirchdorf Gerhard Hoffmann 2024-02-21 11:08:49 +01:00
• e0223b50f9 Added helper getTimeRangeStep() (useful for progressive tariff as for neuhauser/kirchdorf (743) Gerhard Hoffmann 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. Gerhard Hoffmann 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. Gerhard Hoffmann 2024-02-20 13:47:45 +01:00
• 3ff9883647 Neuhauser Krichdorf: new test cases. Neuhauser-Kirchdorf Gerhard Hoffmann 2024-02-19 12:01:36 +01:00
• 696ce644ab GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff) there is no carry over. Gerhard Hoffmann 2024-02-19 12:00:45 +01:00
• 9ea2037eca GetDurationFromCost(): in case of progressive tariff -> implement analogously to GetCostFromDuration(). Gerhard Hoffmann 2024-02-19 11:59:06 +01:00
• c0f0648a74 checkin for the weekend. proper commit-messages later Gerhard Hoffmann 2024-02-16 13:37:24 +01:00
• 1d7779f666 GetCostFromDuration(): implement progressive tariff for Kirchdorf. Gerhard Hoffmann 2024-02-15 16:15:28 +01:00
• 8470bdd574 Minor: change type of parameter 'start-parking-time' to non-const. Gerhard Hoffmann 2024-02-15 16:14:21 +01:00
• 707ab1716b Add addition parsing of ATBTimeRange. Gerhard Hoffmann 2024-02-15 16:13:28 +01:00
• 2ec94121f7 Add testcase for Kirchdorf Gerhard Hoffmann 2024-02-15 16:12:10 +01:00
• 92c3b7c97c Add helper WorkDayId() for future use. Gerhard Hoffmann 2024-02-15 16:11:41 +01:00
• 5ee978f14a Added several members to ATBTimeRange to implement progressive tariff for Kirchdorf. Gerhard Hoffmann 2024-02-15 16:08:22 +01:00
• db0a2c0d01 Minor: replaced 'pragma once' with include guards. Gerhard Hoffmann 2024-02-15 16:07:04 +01:00
• 003644f04d Minor: changed type of parameter 'start_datetime' to non-const to return value. Gerhard Hoffmann 2024-02-15 16:05:49 +01:00
• d30061915e Minor: changed type of parameter 'start_parking_time' to non-const to be able to return value. Gerhard Hoffmann 2024-02-15 16:02:48 +01:00
• 631378deeb Added test cases for Szeged. neuhauser-nordisches-ausbildungszentrum Gerhard Hoffmann 2024-02-01 13:28:08 +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. Gerhard Hoffmann 2024-02-01 13:19:08 +01:00
• 38eca50d83 Minor: more detailed debug output Gerhard Hoffmann 2024-02-01 13:18:27 +01:00
• f7af631de6 Use isParkingAllowed() to steamline source code. 2.0.3 Gerhard Hoffmann 2024-01-31 15:19:31 +01:00
• 15006e8e22 Implemement isParkingAllowed(). Gerhard Hoffmann 2024-01-31 15:19:01 +01:00
• 87c0f4397b Remove meset for price. Rely on default-constructor. Gerhard Hoffmann 2024-01-31 15:15:44 +01:00
• 24c6788427 Add utility isParkingAllowed() Gerhard Hoffmann 2024-01-31 15:14:44 +01:00
• f848baec83 Add defualt-constructor to struct price_t. Gerhard Hoffmann 2024-01-31 15:13:24 +01:00
• 1467a69487 Add TariffTimeRange member to CalcState. Use in isParkingAllowed(). Gerhard Hoffmann 2024-01-31 15:12:41 +01:00
• 0b779b7846 getBusinessHours(): return values with correct type. Gerhard Hoffmann 2024-01-31 15:10:45 +01:00
• 25a39fdc61 Fix getPaymentMethodId(): check for valid iterator. Gerhard Hoffmann 2024-01-31 15:09:42 +01:00
• 9438a535ea Only minor changes Gerhard Hoffmann 2024-01-31 15:08:16 +01:00
• f87399ed44 Fixed getWeekDayWorkTime(). Parameter 'time' must be inside [from, to[. Gerhard Hoffmann 2024-01-31 11:42:33 +01:00
• 868df3dd32 Fixed GetDailyTicket(): use pop_id as key to find payment rate. Gerhard Hoffmann 2024-01-31 11:40:41 +01:00
• d2a85532ce Minor: changed debug output format. Gerhard Hoffmann 2024-01-31 11:40:08 +01:00
• e6399d477b CalcState: add OUTSIDE_ALLOED_PARKING_TIME status (future use). Gerhard Hoffmann 2024-01-31 11:37:49 +01:00
• f450d85bff test for naz Gerhard Hoffmann 2024-01-31 11:37:11 +01:00
• f46adac56d Fixed usage of std::optional value_or: value = value.value_or(...) Gerhard Hoffmann 2024-01-30 14:05:40 +01:00
• c799c24658 Removed local variable PaymentOption. Replaced by usage of currentPaymentOption-vector. Gerhard Hoffmann 2024-01-30 14:04:58 +01:00
• dbcd27b377 Change testcase for Szeged Gerhard Hoffmann 2024-01-30 14:00:55 +01:00
• c2a8f0b00b Begin testcase for NAZ Gerhard Hoffmann 2024-01-30 10:53:43 +01:00
• 088453c179 current tariff-file for naz Gerhard Hoffmann 2024-01-30 10:52:49 +01:00
• 8077167498 Minor: remove unused protection_counter variable Gerhard Hoffmann 2024-01-30 10:52:24 +01:00
• 5deaa48f8e Implement: Gerhard Hoffmann 2024-01-30 10:49:30 +01:00
• 3a6a47725f Re-implement accessors for payment-option(s). Gerhard Hoffmann 2024-01-30 10:48:05 +01:00
• 17968082f1 Insert Customer in cfg->customer multimap Gerhard Hoffmann 2024-01-30 10:47:04 +01:00
• 7dcd7a624b Minor: debug output Gerhard Hoffmann 2024-01-30 10:46:44 +01:00
• 5464054f65 Parsing of PaymentOption(s): there can be several of them Gerhard Hoffmann 2024-01-30 10:45:32 +01:00
• e1ab060dc3 Parsing of Customer in tariff-file. Gerhard Hoffmann 2024-01-30 10:44:58 +01:00
• 8aa9aa497a Persing of DailyTicket entry in tariff-file Gerhard Hoffmann 2024-01-30 10:44:25 +01:00
• 4c1cd45866 Implemented compute_price_for_daily_ticket(). Gerhard Hoffmann 2024-01-30 10:41:29 +01:00
• 6bf3960349 Re-implemented get_minimal_parkingtime() using PERMIT_TYPE-parameter. Gerhard Hoffmann 2024-01-30 10:39:24 +01:00
• 9899fe76fe Add GetDailyTicketPrice() and GetPriceSteps(). Gerhard Hoffmann 2024-01-30 10:37:30 +01:00
• 7bb2cbf01e Add m_priceSteps, ResetPriceSteps() and priceSteps(). Gerhard Hoffmann 2024-01-30 10:35:07 +01:00
• 689bf9b3ba Added compute_price_for_daily_ticket(). Gerhard Hoffmann 2024-01-30 10:33:11 +01:00
• 4c07d9fdb9 get_minimal_parking_time() -> new PERMIT_TYPE parameter Gerhard Hoffmann 2024-01-30 10:31:03 +01:00
• 1e866c74e2 Minot: fix alignment. Gerhard Hoffmann 2024-01-30 10:30:11 +01:00
• c39b3527e1 Add enum PERMIT_TYPE. Gerhard Hoffmann 2024-01-30 10:29:25 +01:00
• f8dc59532c Implemented GetDailyTicketPrice(). To be tested. Gerhard Hoffmann 2024-01-30 10:26:53 +01:00
• 1ea42f88ba Added dummy member GetPriceSteps(). To implement in a later step. Gerhard Hoffmann 2024-01-30 10:25:50 +01:00
• 0af858daea Added multimap for Customer. Using std::optional. Gerhard Hoffmann 2024-01-30 10:20:42 +01:00
• 3311537fee Add reset(). Changed print-format. Gerhard Hoffmann 2024-01-30 10:17:56 +01:00
• 5b8ac6cc59 Add AllDaysWithRestrictedHours. Gerhard Hoffmann 2024-01-30 10:16:55 +01:00
• 809df53658 Add reset() Gerhard Hoffmann 2024-01-30 10:16:16 +01:00
• ea5ca54c4c Add cust_id. Changed print-format. Gerhard Hoffmann 2024-01-30 10:15:39 +01:00
• b347b6e50e Minor: add debug output Gerhard Hoffmann 2024-01-30 10:14:21 +01:00
• 124fd60c41 Add testcases for schoenau Gerhard Hoffmann 2024-01-24 16:36:29 +01:00
• f40ae7200b GetCostFromDuration public for testing Gerhard Hoffmann 2024-01-24 16:35:58 +01:00
• 1173732172 removed typo 2.0.2 neuhauser-bilexa-galtuer Gerhard Hoffmann 2024-01-23 11:03:42 +01:00
• 1b933c05a6 Remove static instance of calculator. Replaced with use of Calculator-singleton-calss. Gerhard Hoffmann 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. Gerhard Hoffmann 2024-01-23 10:53:26 +01:00
• 9af39fa83f Turn Calculator into a singletome and move the list of timesteps inside calculator. Gerhard Hoffmann 2024-01-23 10:51:25 +01:00
• 17ae11212a Test cases Gerhard Hoffmann 2024-01-23 10:50:42 +01:00
• 89b7589600 Minor: add debug output Gerhard Hoffmann 2024-01-23 09:02:55 +01:00
• 179d3348b9 Minor: Fixed typo Gerhard Hoffmann 2024-01-22 15:44:13 +01:00