Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
This commit is contained in:
		@@ -996,15 +996,20 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
			
		||||
        } else {
 | 
			
		||||
            ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 | 
			
		||||
 | 
			
		||||
            // DEBUG
 | 
			
		||||
            //qCritical() << "compute_duration_for_parking_ticket(): ";
 | 
			
		||||
            //qCritical() << "                 endTime: " << endTime;
 | 
			
		||||
            //qCritical() << "           ticketEndTime: " << ticketEndTime;
 | 
			
		||||
 | 
			
		||||
            if (!ticketEndTime.isValid()) {
 | 
			
		||||
                calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
 | 
			
		||||
                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 {
 | 
			
		||||
        return calcState.set(CalcState::State::INVALID_START_DATE);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user