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

Weekend page to show full year.

Browse source 
Highlight current week.
This commit is contained in:
Edward Betts 2025-01-24 20:49:16 +01:00
parent 2f574264e5
commit f5a8676336
3 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
agenda/busy.py
View file

@ -2,7 +2,7 @@
import itertools import itertools
import typing import typing
from datetime import date, datetime, timedelta from datetime import date, timedelta
import flask import flask
@ -43,11 +43,11 @@ def busy_event(e: Event) -> bool:
def get_busy_events( def get_busy_events(
today: date, config: flask.config.Config, trips: list[Trip] start: date, config: flask.config.Config, trips: list[Trip]
) -> list[Event]: ) -> list[Event]:
"""Find busy events from a year ago to two years in the future.""" """Find busy events from a year ago to two years in the future."""
last_year = today - timedelta(days=365) last_year = start - timedelta(days=365)
next_year = today + timedelta(days=2 * 365) next_year = start + timedelta(days=2 * 365)
my_data = config["PERSONAL_DATA"] my_data = config["PERSONAL_DATA"]
events = events_yaml.read(my_data, last_year, next_year, skip_trips=True) events = events_yaml.read(my_data, last_year, next_year, skip_trips=True)
@ -71,7 +71,7 @@ def get_busy_events(
busy_events = [ busy_events = [
e e
for e in sorted(events, key=lambda e: e.as_date) for e in sorted(events, key=lambda e: e.as_date)
if (e.as_date >= today or (e.end_date and e.end_as_date >= today)) if (e.as_date >= start or (e.end_date and e.end_as_date >= start))
and e.as_date < next_year and e.as_date < next_year
and busy_event(e) and busy_event(e)
] ]
@ -79,16 +79,15 @@ def get_busy_events(
return busy_events return busy_events
def weekends(busy_events: list[Event]) -> typing.Sequence[StrDict]: def weekends(start: date, busy_events: list[Event]) -> typing.Sequence[StrDict]:
"""Next ten weekends.""" """Next ten weekends."""
today = datetime.today() weekday = start.weekday()
weekday = today.weekday()
# Calculate the difference to the next or previous Saturday # Calculate the difference to the next or previous Saturday
if weekday == 6: # Sunday if weekday == 6: # Sunday
start_date = (today - timedelta(days=1)).date() start_date = start - timedelta(days=1)
else: else:
start_date = (today + timedelta(days=(5 - weekday))).date() start_date = start + timedelta(days=(5 - weekday))
weekends_info = [] weekends_info = []
for i in range(52): for i in range(52):

16
templates/weekends.html
View file

@ -17,15 +17,21 @@
<tbody> <tbody>
{% for weekend in items %} {% for weekend in items %}
<tr> {% set week_number = weekend.date.isocalendar().week %}
<td class="text-end"> {% if week_number == current_week_number %}
{{ weekend.date.isocalendar().week }} {% set extra_class = " bg-warning-subtle" %}
{% else %}
{% set extra_class = "" %}
{% endif %}
<tr{% if week_number == current_week_number %} class="bg-warning-subtle"{% endif %}>
<td class="text-end{{ extra_class }}">
{{ week_number }}
</td> </td>
<td class="text-end text-nowrap"> <td class="text-end text-nowrap{{ extra_class }}">
{{ weekend.date.strftime("%-d %b %Y") }} {{ weekend.date.strftime("%-d %b %Y") }}
</td> </td>
{% for day in "saturday", "sunday" %} {% for day in "saturday", "sunday" %}
<td> {% if extra_class %}<td class="{{ extra_class|trim }}">{% else %}<td>{% endif %}
{% if weekend[day] %} {% if weekend[day] %}
{% for event in weekend[day] %} {% for event in weekend[day] %}
<a href="{{ event.url }}">{{ event.title }}</a>{% if not loop.last %},{%endif %} <a href="{{ event.url }}">{{ event.title }}</a>{% if not loop.last %},{%endif %}

14
web_view.py
View file

@ -224,11 +224,17 @@ async def gaps_page() -> str:
@app.route("/weekends") @app.route("/weekends")
async def weekends() -> str: async def weekends() -> str:
"""List of available gaps.""" """List of available gaps."""
now = datetime.now() today = date.today()
current_week_number = today.isocalendar().week
start = date(today.year, 1, 1)
trip_list = agenda.trip.build_trip_list() trip_list = agenda.trip.build_trip_list()
busy_events = agenda.busy.get_busy_events(now.date(), app.config, trip_list) busy_events = agenda.busy.get_busy_events(start, app.config, trip_list)
weekends = agenda.busy.weekends(busy_events) weekends = agenda.busy.weekends(start, busy_events)
return flask.render_template("weekends.html", today=now.date(), items=weekends) return flask.render_template(
"weekends.html", items=weekends, current_week_number=current_week_number
)
@app.route("/travel") @app.route("/travel")