Compare commits
	
		
			2 Commits
		
	
	
		
			include-ta
			...
			vorkauf-fi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 78cae24389 | |||
| de0be1d19b | 
@@ -850,6 +850,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            QDateTime effectiveStartTime(start_parking_time);
 | 
					            QDateTime effectiveStartTime(start_parking_time);
 | 
				
			||||||
 | 
					            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:"
 | 
				
			||||||
 | 
					                        << effectiveStartTime.toString(Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // handle special days
 | 
					            // handle special days
 | 
				
			||||||
            int const specialDayId = tariff->specialDayId(start_parking_time);
 | 
					            int const specialDayId = tariff->specialDayId(start_parking_time);
 | 
				
			||||||
@@ -880,6 +882,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:"
 | 
				
			||||||
 | 
					                        << effectiveStartTime.toString(Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // handle prepaid option
 | 
					            // handle prepaid option
 | 
				
			||||||
            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
 | 
					            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
 | 
				
			||||||
            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
 | 
					            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
 | 
				
			||||||
@@ -894,17 +899,36 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                    if (start_parking_time.time() < p.prepaid[weekDay].static_end) {     // static_end: e.g. 08:00:00
 | 
					                    if (start_parking_time.time() < p.prepaid[weekDay].static_end) {     // static_end: e.g. 08:00:00
 | 
				
			||||||
                        effectiveStartTime.setTime(p.prepaid[weekDay].static_end);
 | 
					                        effectiveStartTime.setTime(p.prepaid[weekDay].static_end);
 | 
				
			||||||
 | 
					                        qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:"
 | 
				
			||||||
 | 
					                                    << effectiveStartTime.toString(Qt::ISODate);
 | 
				
			||||||
                    } else
 | 
					                    } else
 | 
				
			||||||
                    if (start_parking_time.time() > p.prepaid[weekDay].static_start) {   // static_start: e.g. 22:00:00
 | 
					                    if (start_parking_time.time() > p.prepaid[weekDay].static_start) {   // static_start: e.g. 22:00:00
 | 
				
			||||||
                        effectiveStartTime.setTime(p.prepaid[weekDay].static_start);
 | 
					                        QTime const midnight(23, 59, 59);
 | 
				
			||||||
 | 
					                        QTime const midnight24(0, 0, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        if ((p.prepaid[weekDay].static_start <= midnight && midnight24 <= p.prepaid[weekDay].static_end)
 | 
				
			||||||
 | 
					                         || (p.prepaid[weekDay].static_start == midnight && midnight == p.prepaid[weekDay].static_end)
 | 
				
			||||||
 | 
					                         || (p.prepaid[weekDay].static_start == midnight24 && midnight24 == p.prepaid[weekDay].static_end)) {
 | 
				
			||||||
 | 
					                            effectiveStartTime = effectiveStartTime.addDays(1);
 | 
				
			||||||
 | 
					                            weekDay = effectiveStartTime.date().dayOfWeek();
 | 
				
			||||||
 | 
					                            qCritical() << __func__ << ":" << __LINE__
 | 
				
			||||||
 | 
					                                        << "effectiveStartTime: new week day [" << weekDay << "] (Mon=1, Tue=2, ..., Sun=7)";
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                        effectiveStartTime.setTime(p.prepaid[weekDay].static_end);
 | 
				
			||||||
 | 
					                        qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:"
 | 
				
			||||||
 | 
					                                    << effectiveStartTime.toString(Qt::ISODate);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qCritical() << __func__ << ":" << __LINE__ << "no prepaid option set";
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // set seconds to 0
 | 
				
			||||||
            effectiveStartTime.setTime(QTime(effectiveStartTime.time().hour(),
 | 
					            effectiveStartTime.setTime(QTime(effectiveStartTime.time().hour(),
 | 
				
			||||||
                                             effectiveStartTime.time().minute(), 0));
 | 
					                                             effectiveStartTime.time().minute(), 0));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:" << effectiveStartTime.toString(Qt::ISODate);
 | 
					            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:"
 | 
				
			||||||
 | 
					                        << effectiveStartTime.toString(Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            int const carryOver = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over;
 | 
					            int const carryOver = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -927,12 +951,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
                    s = s.addSecs(minutesUntilCarryOver * 60);
 | 
					                    s = s.addSecs(minutesUntilCarryOver * 60);
 | 
				
			||||||
                    s = s.addSecs(carryOverDuration * 60);
 | 
					                    s = s.addSecs(carryOverDuration * 60);
 | 
				
			||||||
                    end_parking_time = s.addSecs(rest * 60);
 | 
					                    end_parking_time = s.addSecs(rest * 60);
 | 
				
			||||||
 | 
					                    qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
 | 
				
			||||||
                } else {
 | 
					                } else {
 | 
				
			||||||
                    end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
 | 
					                    end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
 | 
				
			||||||
 | 
					                    qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                weekDay = end_parking_time.date().dayOfWeek();
 | 
					                weekDay = end_parking_time.date().dayOfWeek();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                // musste man in einer schleife machen
 | 
					                // musste man in einer schleife machen
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user