From 92c3b7c97c5f9080f311559b74ca238f2366c60e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 15 Feb 2024 16:11:41 +0100 Subject: [PATCH] Add helper WorkDayId() for future use. --- library/include/mobilisis/utilities.h | 2 ++ library/src/utilities.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/library/include/mobilisis/utilities.h b/library/include/mobilisis/utilities.h index 342b193..1e52a8b 100644 --- a/library/include/mobilisis/utilities.h +++ b/library/include/mobilisis/utilities.h @@ -79,6 +79,8 @@ namespace Utilities { QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId); QTime WeekDaysWorkTimeFrom(std::multimap::const_iterator itr); QTime WeekDaysWorkTimeUntil(std::multimap::const_iterator itr); + int WeekDayId(std::multimap::const_iterator itr); + // PaymentRate GetPaymentRate(Configuration const *cfg, ); bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId); bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId); PaymentMethod getPaymentMethodId(Configuration const *cfg); diff --git a/library/src/utilities.cpp b/library/src/utilities.cpp index b42ce2a..7fe41f7 100644 --- a/library/src/utilities.cpp +++ b/library/src/utilities.cpp @@ -345,6 +345,10 @@ QTime Utilities::WeekDaysWorkTimeUntil(std::multimap:: return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate); } +int Utilities::WeekDayId(std::multimap::const_iterator itr) { + return itr->second.pwd_period_day_in_week_id; +} + bool Utilities::isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId) { return !isCarryOverNotSet(cfg, paymentMethodId); } @@ -406,8 +410,6 @@ uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) { int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours; - qCritical() << __func__ << ":" << __LINE__ << businessHours; - switch (businessHours) { case NoRestriction_24_7: return BusinessHours::NoRestriction_24_7; case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays;