Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
This commit is contained in:
		@@ -207,11 +207,16 @@ 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(inputDate.addSecs(duration_previous * 60));
 | 
					                            QDateTime d;
 | 
				
			||||||
 | 
					                            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 << "configured minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
 | 
					                            qCritical() << DBG_HEADER << "           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