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

538 Commits

Author SHA1 Message Date
GerhardHoffmann 57ccbc150a compute_duration_for_parking_ticket(): set calcState according to string 
returned from tariff calculation.
 2024-06-05 17:03:33 +02:00
GerhardHoffmann 8fa4335669 Minor: fixed typo. 2024-06-05 17:03:10 +02:00
GerhardHoffmann 49298a1821 Extend Calculator::GetDurationFromCost() (needed for Neuhauser/Stockerau/748). 2024-06-05 17:00:27 +02:00
GerhardHoffmann 6fb4d245cb Added CalcState &setStatus(QString const &desc); 2024-06-05 16:58:12 +02:00
GerhardHoffmann 2dc93271fd Added WORKING_DAYS_WITH_RESTRICTED_HOURS (introduced for Neuhauder/Stockerau/748) 2024-06-05 16:52:54 +02:00
GerhardHoffmann 5be5798681 Declared iterator-arguments as const-references to get rid of compiler 
warning: parameter passing for argument multi_map changed in gcc7.1
 2024-06-04 11:48:50 +02:00
GerhardHoffmann 1a24bc4572 Add comment about main-change(s). 2024-06-04 11:39:30 +02:00
GerhardHoffmann e121cef17e Added: uint32_t getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId); 2024-06-04 11:26:36 +02:00
GerhardHoffmann bdaea1106c Fix: read price for daily ticket directly from entry PaymentOptions 
in tariff-file if it is not given as part of a Json-Product-Array in tariff-file.
 2024-06-04 11:24:15 +02:00
GerhardHoffmann bc17213597 Minor: Add/change some debug putput. 2024-06-04 11:23:35 +02:00
GerhardHoffmann 64b2b4bd85 Fix: Handle case if "pop_carry_over_start_time_range" and "pop_carry_over_end_time_range" 
is not given in tariff file.
 2024-06-04 11:19:39 +02:00
GerhardHoffmann 8737508839 Minor: add case for PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET (TODO). 2024-06-04 11:18:47 +02:00
GerhardHoffmann 02f0500eac Minor: Add some (commented-out) debug messages. 2024-06-04 11:18:00 +02:00
GerhardHoffmann 2d53224feb Minor: add some (commented out) debug output -> used for debugging. 2024-05-15 15:23:12 +02:00
GerhardHoffmann 38964ad9a8 get_minimal_parkingprice(): for PERMIT_TYPE::DAY_TICKET 
call compute_product_price(cfg, permitType, start) to get
minimal price dependent on 'start' datetime.
 2024-05-15 15:21:38 +02:00
GerhardHoffmann d3f18f3b82 get_minimal_parkingprice(): add default parameter 'start', set to 
value of QDateTime::currentDateTime();
 2024-05-15 15:19:47 +02:00
GerhardHoffmann eb20410849 Use paymentOptionIndex in getPaymentOptions() 2024-05-08 16:34:07 +02:00
GerhardHoffmann 6a5272da7a Fix: Check if endTime is still on the same day. 2024-05-07 15:01:16 +02:00
GerhardHoffmann 4d5583df2d Handling for pop_carry_over_traget. 2024-05-07 14:59:00 +02:00
GerhardHoffmann de6f263817 Add FRI/SAT/SUN with restricted hours. 2024-05-07 14:57:41 +02:00
GerhardHoffmann b71c979a91 Fix: getPaymentOptionIndex() -> return 0 instead of -1 
Removed exit(0)-call which was used for testing.
 2024-05-06 11:36:12 +02:00
GerhardHoffmann 33f43fb83d Start parsing of pop_min_date_time and pop_max_date_time 2024-05-03 13:50:10 +02:00
GerhardHoffmann 1606a784a4 Add macro _WEEKEND_WITH_RESTRICTED_HOURS_. 2024-05-03 13:49:15 +02:00
GerhardHoffmann 9f2cf613e1 Add struct ATBMaxDateTime. 2024-05-03 13:48:27 +02:00
GerhardHoffmann dbd9644047 Add ATBPaymentOptionType = std::multimap<int, ATBPaymentOption> 2024-05-03 13:47:28 +02:00
GerhardHoffmann 1dd81d4a56 get_minimal_parkingtime(): const Configuration parameter. 
Cast of const pointer necessary.

get_maximal_parkingtime(): const Configuration parameter.
 2024-04-30 14:08:08 +02:00
GerhardHoffmann f93cf11d23 get_minimal_parkingtime() 
get_maximal_parkingtime(): made configuration parameter const.
 2024-04-30 14:06:04 +02:00
GerhardHoffmann 9d0ac4f8ce Add TWENTY_FOUR_HOURS_TICKET. Add toString() and implement conversion 
operators in therm of toString().
 2024-04-30 13:51:31 +02:00
GerhardHoffmann 4ec5589f30 Implement getTariffProductForProductId() in terms of 
getTariffProductForProductTypeName().
 2024-04-30 13:49:49 +02:00
GerhardHoffmann c1d5ffcf3c Implement getTariffProductForProductTypeName(). 
Use the type names of PERMIT_TYPE, not real indices as they can change.
 2024-04-30 13:48:03 +02:00
GerhardHoffmann 7aded2b7fb Explicit cast due to compiler warning. 2024-04-30 13:46:59 +02:00
GerhardHoffmann ed9e60a972 Declaration for getTariffProductForProductTypeName(). 2024-04-30 13:45:22 +02:00
GerhardHoffmann 5d35331c83 Minor: introduced TariffProductType. 2024-04-30 13:44:53 +02:00
GerhardHoffmann c7623429d9 Compute end_parking_time using "netto_parking_time", which is the 
current timestep.
 2024-04-25 15:41:52 +02:00
GerhardHoffmann b596086245 Pass paymentOptionIndex to cfg->getPaymentOptions(), which has 
a default parameter of paymentOptionIndex=0.
 2024-04-24 13:20:02 +02:00
GerhardHoffmann 24ca857b6f Fix: init m_timeSteps-vector in case its size is 0: m_timeSteps.push_back(QList<int>()). 
Detected during testing.
 2024-04-24 13:18:23 +02:00
GerhardHoffmann ea0bcde413 Check iterator for it != cfg->TimeRange.cend(). 2024-04-24 13:16:22 +02:00
GerhardHoffmann e93b08505a Minor: introduce TimeRangeType as typedef for std::multimap<int, ATBTimeRange>. 2024-04-24 13:14:04 +02:00
GerhardHoffmann e17e54b315 Minor: add define: _ALL_DAYS_WITH_RESTRICTED_HOURS_ 2024-04-19 14:10:47 +02:00
GerhardHoffmann d07fdd8540 GetPriceForTimeStep(): use parameter paymentOptionIndex. 2024-04-19 13:33:54 +02:00
GerhardHoffmann 1fab458de3 Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() 
and isParkingAllowed() (4 parameters) using the 2 functions.
 2024-04-19 13:32:24 +02:00
GerhardHoffmann 1ac2ca91c5 GetCostFromDuration(): use new parameter paymentOptionIndex. 2024-04-19 13:31:01 +02:00
GerhardHoffmann 1852f552a3 compute_price_for_parking_ticket(): compute paymentOptionIndex. 
(a tariff-file can conatin more than one payment options).
 2024-04-19 13:28:35 +02:00
GerhardHoffmann e2c02420f0 Add parsing for new values in helper-structures. 
NOTE: unfortunately switched to Unix-File-Format.
 2024-04-19 13:26:33 +02:00
GerhardHoffmann e20eb93abf Implement SpecialDaysWorkTimeFrom() and SpecialDaysWorkTimeUntil(). 
Extend getBusinessHours() to include new enum-values.
Implement isDayIncluded() as switch-case on dayOfWeek.
Implement dumpBusinessHours().
 2024-04-19 13:21:38 +02:00
GerhardHoffmann b0e7bd91b4 Add ariff_global_defines.h. 2024-04-19 13:20:44 +02:00
GerhardHoffmann 0cd4424434 Add utilities 
isDayIncluded(), SpecialDaysWorkTimeFrom() and specialDaysWorkTimeUntil().
 2024-04-19 13:19:26 +02:00
GerhardHoffmann 1991853b66 Add new enum-values for business_hours. Keep the old ones for 
backward-compatibility.
 2024-04-19 13:18:02 +02:00
GerhardHoffmann b31fcc5f4f Minor: add explicit default constructor. 2024-04-19 13:17:00 +02:00
GerhardHoffmann dbe649d0e4 Add member variables 
pop_carry_over_start_time_range
pop_carry_over_end_time_range:

If carry-over has been set, then provide the limits
for the carry-over: at the end of day1 (start) and
at the beginning of the next day (end).
 2024-04-19 13:12:46 +02:00