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

Show current trip on home page

Browse source
This commit is contained in:
Edward Betts 2024-08-11 12:50:58 +02:00
parent 6e9604e4c1
commit 259642ff52
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
templates/event_list.html
View file

@ -39,6 +39,7 @@
} %} } %}
{% from "macros.html" import trip_link, display_date_no_year with context %}
{% from "navbar.html" import navbar with context %} {% from "navbar.html" import navbar with context %}
<body> <body>
@ -79,6 +80,19 @@
<p>{{ market }}</p> <p>{{ market }}</p>
{% endfor %} {% endfor %}
{% if current_trip %}
{% set end = current_trip.end %}
<div>
<div>Current trip: {{ trip_link(current_trip) }}</div>
{% if end %}
<div>Dates: {{ display_date_no_year(current_trip.start) }} to {{ display_date_no_year(end) }}</div>
{% else %}
<div>Start: {{ display_date_no_year(current_trip.start) }} (end date missing)</div>
{% endif %}
</div>
{% endif %}
<h3>Agenda</h3> <h3>Agenda</h3>
<div> <div>

14
web_view.py
View file

@ -68,6 +68,19 @@ def exception_handler(e: werkzeug.exceptions.InternalServerError) -> tuple[str,
) )
def get_current_trip(today: date) -> Trip | None:
"""Get current trip."""
trip_list = get_trip_list(route_distances=None)
current = [
item
for item in trip_list
if item.start <= today and (item.end or item.start) >= today
]
assert len(current) < 2
return current[0] if current else None
@app.route("/") @app.route("/")
async def index() -> str: async def index() -> str:
"""Index page.""" """Index page."""
@ -87,6 +100,7 @@ async def index() -> str:
"event_list.html", "event_list.html",
today=now.date(), today=now.date(),
events=events, events=events,
current_trip=get_current_trip(now.date()),
fullcalendar_events=calendar.build_events(events), fullcalendar_events=calendar.build_events(events),
start_event_list=date.today() - timedelta(days=1), start_event_list=date.today() - timedelta(days=1),
end_event_list=date.today() + timedelta(days=365 * 2), end_event_list=date.today() + timedelta(days=365 * 2),