Compare commits
5 Commits
2.3.99-15
...
5131892744
Author | SHA1 | Date | |
---|---|---|---|
5131892744 | |||
6d6615b81e | |||
eafbfd60c3 | |||
41fc924a7c | |||
cbcf8391b3 |
@@ -1003,20 +1003,15 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
|
|||||||
} else {
|
} else {
|
||||||
ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
|
ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
|
||||||
|
|
||||||
|
// DEBUG
|
||||||
|
//qCritical() << "compute_duration_for_parking_ticket(): ";
|
||||||
|
//qCritical() << " endTime: " << endTime;
|
||||||
|
//qCritical() << " ticketEndTime: " << ticketEndTime;
|
||||||
|
|
||||||
if (!ticketEndTime.isValid()) {
|
if (!ticketEndTime.isValid()) {
|
||||||
calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
|
calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
|
||||||
return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
|
return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
|
|
||||||
ticketEndTime = ticketEndTime.addDays(-1);
|
|
||||||
ticketEndTime.setTime(QTime(23, 59, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
// DEBUG
|
|
||||||
qCritical() << "compute_duration_for_parking_ticket(): ";
|
|
||||||
qCritical() << " endTime: " << endTime;
|
|
||||||
qCritical() << " ticketEndTime: " << ticketEndTime;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return calcState.set(CalcState::State::INVALID_START_DATE);
|
return calcState.set(CalcState::State::INVALID_START_DATE);
|
||||||
|
@@ -207,16 +207,11 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
|||||||
//found = true;
|
//found = true;
|
||||||
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
|
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
|
||||||
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
|
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
|
||||||
QDateTime d;
|
QDateTime d(inputDate.addSecs(duration_previous * 60));
|
||||||
if (pop_accumulate_durations) {
|
|
||||||
d = inputDate.addSecs(durationInMinutes * 60);
|
|
||||||
} else {
|
|
||||||
d = inputDate.addSecs(duration_previous * 60);
|
|
||||||
}
|
|
||||||
|
|
||||||
qCritical() << DBG_HEADER << " provided price (cost):" << cost;
|
qCritical() << DBG_HEADER << " provided price (cost):" << cost;
|
||||||
qCritical() << DBG_HEADER << " computed time for price (minutes):" << duration_previous;
|
qCritical() << DBG_HEADER << " computed time for price (minutes):" << duration_previous;
|
||||||
qCritical() << DBG_HEADER << " minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
|
qCritical() << DBG_HEADER << "configured minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
|
||||||
|
|
||||||
if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
|
if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
|
||||||
return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
|
return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
|
||||||
|
Reference in New Issue
Block a user