edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Include current trip in future list

Browse source
This commit is contained in:
Edward Betts 2024-05-18 12:14:34 +02:00
parent afb96bc855
commit c9fcf1d5e7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web_view.py
View file

@ -311,6 +311,12 @@ def trip_future_list() -> str:
trip_list = get_trip_list(route_distances) trip_list = get_trip_list(route_distances)
today = date.today() today = date.today()
current = [
item
for item in trip_list
if item.start <= today and (item.end or item.start) >= today
]
future = [item for item in trip_list if item.start > today] future = [item for item in trip_list if item.start > today]
coordinates, routes = agenda.trip.get_coordinates_and_routes(future) coordinates, routes = agenda.trip.get_coordinates_and_routes(future)
@ -318,7 +324,7 @@ def trip_future_list() -> str:
return flask.render_template( return flask.render_template(
"trip/list.html", "trip/list.html",
heading="Future trips", heading="Future trips",
trips=future, trips=current + future,
coordinates=coordinates, coordinates=coordinates,
routes=routes, routes=routes,
today=today, today=today,