last fixes before presentation
This commit is contained in:
		@@ -37,6 +37,11 @@ static QDateTime start_ = QDateTime::currentDateTime();
 | 
			
		||||
static Configuration const *current_tariff{nullptr};
 | 
			
		||||
 | 
			
		||||
int CALCULATE_LIBRARY_API isOutOfService(QDateTime const &dt) {
 | 
			
		||||
    if (!current_tariff) {
 | 
			
		||||
        qCritical() << __func__ << ":" << __LINE__ << "NO CURRENT TARIFF";
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // L201
 | 
			
		||||
    if (current_tariff->tariffFileName.contains("tariff01")) {
 | 
			
		||||
        qCritical() << __func__ << ":" << __LINE__ << "NO";
 | 
			
		||||
@@ -67,7 +72,7 @@ int CALCULATE_LIBRARY_API isOutOfService(QDateTime const &dt) {
 | 
			
		||||
 | 
			
		||||
        if (dt.time() >= QTime::fromString("23:00:00", Qt::ISODate)) {
 | 
			
		||||
            qCritical() << __func__ << ":" << __LINE__ << "YES";
 | 
			
		||||
            return false;
 | 
			
		||||
            return true;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    } else
 | 
			
		||||
@@ -825,6 +830,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
 | 
			
		||||
        }
 | 
			
		||||
        QFileInfo fi(confFile);
 | 
			
		||||
        (*tariff)->tariffFileName << fi.baseName();
 | 
			
		||||
        current_tariff = *tariff;
 | 
			
		||||
    } else {
 | 
			
		||||
        delete *tariff;
 | 
			
		||||
        *tariff = nullptr;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user