GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
454 Commits 23 Branches 42 Tags
977356040c2125a427d84533fa0032bd2afa086c
Commit Graph

212 Commits

Author SHA1 Message Date
GerhardHoffmann 8bbec596c9 Check for 08:00 <= currentTime <= 20:00 removed: 
assumption is prepaid.
 2024-02-28 09:58:00 +01:00
GerhardHoffmann 87b14ee3f8 Added check for NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM: 
08:00 <= currentTime <= 20:00.
 2024-02-28 09:26:51 +01:00
GerhardHoffmann 7831329b11 kirchdorf: getDurationFromCost(): to be tested 2024-02-27 17:11:00 +01:00
GerhardHoffmann abbbd06f93 GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive 
(e.g. neuhauser/kirchdorf (743))
 2024-02-27 12:25:13 +01:00
GerhardHoffmann b741d2e312 test 2024-02-26 16:57:37 +01:00
GerhardHoffmann bd1bdf8a8c Implement compute_procuct_price() 2024-02-22 16:38:41 +01:00
GerhardHoffmann 6d18ce4caa GetDailyTicketPrice(): improve for projects which have not defined a daily ticket in their tariff-files. 2024-02-22 16:37:11 +01:00
GerhardHoffmann 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
GerhardHoffmann afb0e20dd2 Implement parsing of "Product" and adding into TariffProduct. 2024-02-22 16:33:19 +01:00
GerhardHoffmann 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
GerhardHoffmann c0f81f174a compute_price_for_parking_ticket(): added parameter bool prepaid. Set to true as default. 2024-02-22 09:42:02 +01:00
GerhardHoffmann 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
GerhardHoffmann 7933c826e6 Synced GetDurationFromCost() with GetCostFromDuration() 2024-02-21 14:53:06 +01:00
GerhardHoffmann 9d5ddfc328 GetCostFromDuration(): fixed moving from time range 8:00-12:00 -> 14:00-18:00. 2024-02-21 14:20:51 +01:00
GerhardHoffmann 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
GerhardHoffmann 81d515eb7f GetCostFromDuration(): set endtime to start in case cost==0. 2024-02-21 11:13:53 +01:00
GerhardHoffmann 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
GerhardHoffmann e0223b50f9 Added helper getTimeRangeStep() (useful for progressive tariff as for neuhauser/kirchdorf (743) 2024-02-21 09:31:13 +01:00
GerhardHoffmann 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
GerhardHoffmann 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
GerhardHoffmann 696ce644ab GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff) 
there is no carry over.
 2024-02-19 12:00:45 +01:00
GerhardHoffmann 9ea2037eca GetDurationFromCost(): in case of progressive tariff 
-> implement analogously to GetCostFromDuration().
 2024-02-19 11:59:06 +01:00
GerhardHoffmann c0f0648a74 checkin for the weekend. proper commit-messages later 2024-02-16 13:37:24 +01:00
GerhardHoffmann 1d7779f666 GetCostFromDuration(): implement progressive tariff for Kirchdorf. 2024-02-15 16:15:28 +01:00
GerhardHoffmann 8470bdd574 Minor: change type of parameter 'start-parking-time' to non-const. 2024-02-15 16:14:21 +01:00
GerhardHoffmann 707ab1716b Add addition parsing of ATBTimeRange. 2024-02-15 16:13:28 +01:00
GerhardHoffmann 92c3b7c97c Add helper WorkDayId() for future use. 2024-02-15 16:11:41 +01:00
GerhardHoffmann 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
GerhardHoffmann 38eca50d83 Minor: more detailed debug output 2024-02-01 13:18:27 +01:00
GerhardHoffmann f7af631de6 Use isParkingAllowed() to steamline source code. 2024-01-31 15:19:31 +01:00
GerhardHoffmann 15006e8e22 Implemement isParkingAllowed(). 2024-01-31 15:19:01 +01:00
GerhardHoffmann 87c0f4397b Remove meset for price. Rely on default-constructor. 2024-01-31 15:15:44 +01:00
GerhardHoffmann 0b779b7846 getBusinessHours(): return values with correct type. 2024-01-31 15:10:45 +01:00
GerhardHoffmann 25a39fdc61 Fix getPaymentMethodId(): check for valid iterator. 2024-01-31 15:09:42 +01:00
GerhardHoffmann f87399ed44 Fixed getWeekDayWorkTime(). Parameter 'time' must be inside [from, to[. 2024-01-31 11:42:33 +01:00
GerhardHoffmann 868df3dd32 Fixed GetDailyTicket(): use pop_id as key to find payment rate. 2024-01-31 11:40:41 +01:00
GerhardHoffmann d2a85532ce Minor: changed debug output format. 2024-01-31 11:40:08 +01:00
GerhardHoffmann f46adac56d Fixed usage of std::optional value_or: 
value = value.value_or(...)
 2024-01-30 14:05:40 +01:00
GerhardHoffmann c799c24658 Removed local variable PaymentOption. Replaced by usage of currentPaymentOption-vector. 2024-01-30 14:04:58 +01:00
GerhardHoffmann 8077167498 Minor: remove unused protection_counter variable 2024-01-30 10:52:24 +01:00
GerhardHoffmann 5deaa48f8e Implement: 
getDailyTicketsForAllKeys(), getDailyTicketsForKey(), getPaymentRateForAllKeys(),
getPaymentRateForKey(), getCustomerForType() and getWeekDayWorkTime().
 2024-01-30 10:49:30 +01:00
GerhardHoffmann 3a6a47725f Re-implement accessors for payment-option(s). 2024-01-30 10:48:05 +01:00
GerhardHoffmann 17968082f1 Insert Customer in cfg->customer multimap 2024-01-30 10:47:04 +01:00
GerhardHoffmann 7dcd7a624b Minor: debug output 2024-01-30 10:46:44 +01:00
GerhardHoffmann 5464054f65 Parsing of PaymentOption(s): there can be several of them 2024-01-30 10:45:32 +01:00
GerhardHoffmann e1ab060dc3 Parsing of Customer in tariff-file. 2024-01-30 10:44:58 +01:00
GerhardHoffmann 8aa9aa497a Persing of DailyTicket entry in tariff-file 2024-01-30 10:44:25 +01:00
GerhardHoffmann 4c1cd45866 Implemented compute_price_for_daily_ticket(). 2024-01-30 10:41:29 +01:00
GerhardHoffmann 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
GerhardHoffmann f8dc59532c Implemented GetDailyTicketPrice(). 
To be tested.
 2024-01-30 10:27:46 +01:00