mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 08:08:42 +00:00
Keep time when inserting / deleting restdays (#4708)
When inserting or deleting a restday in month-view of the PlanningCalendar, the time of that activity was set to midnight. With this change the original time is kept
This commit is contained in:
committed by
GitHub
parent
01ab7d1500
commit
a883b3fb03
@@ -131,7 +131,7 @@ PlanningCalendarWindow::PlanningCalendarWindow(Context *context)
|
|||||||
}
|
}
|
||||||
for (int i = plannedRides.size() - 1; i >= 0; --i) {
|
for (int i = plannedRides.size() - 1; i >= 0; --i) {
|
||||||
QDate destDay = plannedRides[i]->dateTime.date().addDays(1);
|
QDate destDay = plannedRides[i]->dateTime.date().addDays(1);
|
||||||
movePlannedActivity(plannedRides[i], destDay);
|
movePlannedActivity(plannedRides[i], destDay, plannedRides[i]->dateTime.time());
|
||||||
}
|
}
|
||||||
updateActivities();
|
updateActivities();
|
||||||
QApplication::restoreOverrideCursor();
|
QApplication::restoreOverrideCursor();
|
||||||
@@ -142,7 +142,7 @@ PlanningCalendarWindow::PlanningCalendarWindow(Context *context)
|
|||||||
for (RideItem *rideItem : context->athlete->rideCache->rides()) {
|
for (RideItem *rideItem : context->athlete->rideCache->rides()) {
|
||||||
if (rideItem != nullptr && rideItem->planned && rideItem->dateTime.date() >= day) {
|
if (rideItem != nullptr && rideItem->planned && rideItem->dateTime.date() >= day) {
|
||||||
QDate destDay = rideItem->dateTime.date().addDays(-1);
|
QDate destDay = rideItem->dateTime.date().addDays(-1);
|
||||||
movePlannedActivity(rideItem, destDay);
|
movePlannedActivity(rideItem, destDay, rideItem->dateTime.time());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
QApplication::restoreOverrideCursor();
|
QApplication::restoreOverrideCursor();
|
||||||
|
|||||||
Reference in New Issue
Block a user