Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge pull request 'order logbook by arrival' (#612) from order-logbook-by-arrival into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m21s
Details
CI/CD Pipeline / deploy-staging (push) Has been skipped
Details
CI/CD Pipeline / deploy-main (push) Successful in 17m57s
Details

Browse Source 
Reviewed-on: #612
This commit is contained in:
philipp 2024-06-27 08:52:22 +02:00
commit 323f721fc0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/model/logbook.rs
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)