fix-steering-only-boat-logentry #623

Merged
philipp merged 9 commits from fix-steering-only-boat-logentry into staging 2024-07-13 21:14:30 +02:00
Showing only changes of commit bd7cd0020e - Show all commits

View File

@ -242,7 +242,7 @@ ORDER BY departure DESC
FROM logbook FROM logbook
JOIN rower ON logbook.id = rower.logbook_id JOIN rower ON logbook.id = rower.logbook_id
WHERE arrival is not null AND rower_id = {} WHERE arrival is not null AND rower_id = {}
ORDER BY departure DESC ORDER BY arrival DESC
", user.id) ", user.id)
) )
.fetch_all(db) .fetch_all(db)
@ -275,7 +275,7 @@ ORDER BY departure DESC
SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
FROM logbook FROM logbook
WHERE arrival is not null AND arrival LIKE '{}-%' WHERE arrival is not null AND arrival LIKE '{}-%'
ORDER BY departure DESC ORDER BY arrival DESC
", year) ", year)
) )
.fetch_all(db) .fetch_all(db)