Changeset View
Changeset View
Standalone View
Standalone View
src/mergeutil.cpp
Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Line(s) | 71 | { | |||
---|---|---|---|---|---|
148 | 148 | | |||
149 | // restaurant reservation: same restaurant, same booking ref, same day | 149 | // restaurant reservation: same restaurant, same booking ref, same day | ||
150 | if (JsonLd::isA<FoodEstablishmentReservation>(lhs)) { | 150 | if (JsonLd::isA<FoodEstablishmentReservation>(lhs)) { | ||
151 | const auto lhsRes = lhs.value<FoodEstablishmentReservation>(); | 151 | const auto lhsRes = lhs.value<FoodEstablishmentReservation>(); | ||
152 | const auto rhsRes = rhs.value<FoodEstablishmentReservation>(); | 152 | const auto rhsRes = rhs.value<FoodEstablishmentReservation>(); | ||
153 | if (lhsRes.reservationNumber() != rhsRes.reservationNumber()) { | 153 | if (lhsRes.reservationNumber() != rhsRes.reservationNumber()) { | ||
154 | return false; | 154 | return false; | ||
155 | } | 155 | } | ||
156 | return isSame(lhsRes.reservationFor(), rhsRes.reservationFor()) && lhsRes.startTime().date() == rhsRes.endTime().date(); | 156 | auto endTime = rhsRes.endTime(); | ||
157 | if (!endTime.isValid()) { | ||||
158 | endTime = QDateTime(rhsRes.startTime().date(), QTime(23, 59, 59)); | ||||
159 | } | ||||
160 | | ||||
161 | return isSame(lhsRes.reservationFor(), rhsRes.reservationFor()) && lhsRes.startTime().date() == endTime.date(); | ||||
157 | } | 162 | } | ||
158 | if (JsonLd::isA<FoodEstablishment>(lhs)) { | 163 | if (JsonLd::isA<FoodEstablishment>(lhs)) { | ||
159 | const auto lhsRestaurant = lhs.value<FoodEstablishment>(); | 164 | const auto lhsRestaurant = lhs.value<FoodEstablishment>(); | ||
160 | const auto rhsRestaurant = rhs.value<FoodEstablishment>(); | 165 | const auto rhsRestaurant = rhs.value<FoodEstablishment>(); | ||
161 | return isSameFoodEstablishment(lhsRestaurant, rhsRestaurant); | 166 | return isSameFoodEstablishment(lhsRestaurant, rhsRestaurant); | ||
162 | } | 167 | } | ||
163 | 168 | | |||
164 | // event reservation | 169 | // event reservation | ||
▲ Show 20 Lines • Show All 118 Lines • Show Last 20 Lines |