From c51d350618f26ef81000996a52b584eeac2b6c30 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 12 Dec 2023 10:53:10 +0100 Subject: [PATCH] Minor: Moved getMinimalParkingTime(), getMaximalParkingTime(), getMinimalParkingPrice() computeWeekDaysPrice() and computeWeekDaysDurationUnit() to Utilities namespace. --- library/src/calculator_functions.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 677dd13..e1a247d 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -266,18 +266,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg, return t.getPrice(); } -int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) { - return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0); -} - -int Calculator::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) { - return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0); -} - -uint32_t Calculator::getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId) { - return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_price, 0); -} - bool Calculator::checkDurationMinutes(int minParkingTime, int maxParkingTime, int durationMinutes) { @@ -322,17 +310,6 @@ int Calculator::findNextWorkTimeRange(QDateTime const &dt, return nextWorkTimeRange; } -uint32_t Calculator::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) const { - int pop_id = cfg->PaymentOption.find(id)->second.pop_id; - return cfg->PaymentRate.find(pop_id)->second.pra_price; -} - -double Calculator::computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) const { - int pop_id = cfg->PaymentOption.find(id)->second.pop_id; - int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id; - return (double)(cfg->Duration.find(durationId)->second.pun_duration); -} - using namespace Utilities; Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,