diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 6b077b5..9c2d690 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -364,6 +364,9 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg, QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil(); + // qCritical() << "start" << start.toString(Qt::ISODate) + // << "current" << current.toString(Qt::ISODate) << lastWorktimeTo; + // find worktime range to start with int currentRange = 0; if (!isSpecialDay) { @@ -386,6 +389,8 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg, } } + // qCritical() << "current" << current.toString(Qt::ISODate); + for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) { if (durationMinutes > 0) { QTime const &worktime_from = worktime[w].getTimeFrom(); @@ -416,12 +421,13 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg, return Ticket(); } } else { - qDebug() << "* PREPAID MODE ACTIVE *"; + //qDebug() << "* PREPAID MODE ACTIVE *"; + //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_from << lastWorktimeTo; if (current.time() < worktime_from) { current.setTime(worktime_from); end = current; } else if(current.time() > lastWorktimeTo) { - qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day"; + //qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day"; end = current; current.setTime(QTime()); continue; @@ -442,6 +448,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg, current.setTime(QTime()); break; // stop while, and continue in outer loop } else { + //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_to; if(current.time() < worktime_to) { // Increment input date minutes for each monetary unit current = current.addSecs(60); @@ -449,6 +456,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg, durationMinutes -= 1; //costFromDuration += price_per_unit; costFromDuration += price; + //qCritical() << "current" << current.toString(Qt::ISODate); } else break; } } // while(durationMinutes > 0) {