GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GetDailyTicketDuration():

Browse Source 
replace ZellersAlgorithm by qts build in method dayOfWeek().
This commit is contained in:
Gerhard Hoffmann 2023-12-12 11:34:04 +01:00
parent ebb5bad7c5
commit 8d7d175b51
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/src/calculator_functions.cpp
View File

@ -39,7 +39,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price; int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
if(daily_card_price <= 0) { if(daily_card_price <= 0) {
qCritical() << "Calculator::GetDailyTicketDuration(): Daily ticket price zero or less"); qCritical() << "Calculator::GetDailyTicketDuration(): Daily ticket price zero or less";
return QDateTime(); return QDateTime();
} }
@ -74,12 +74,10 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
else else
{ {
// Get day of week // Get day of week
int weekdayId = 0; int const weekdayId = inputDateTime.date().dayOfWeek();
weekdayId = Utilities::ZellersAlgorithm(inputDateTime.date().day(),inputDateTime.date().month(),inputDateTime.date().year());
// If no working day found, skip it (recursively call method again) // If no working day found, skip it (recursively call method again)
size_t found = 0; size_t found = cfg->WeekDaysWorktime.count(weekdayId);
found = cfg->WeekDaysWorktime.count(weekdayId);
// When no workday found, go to next available day // When no workday found, go to next available day
if(found <=0) if(found <=0)