bernard/RosterChief
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coach Schedule: same This week/Next week/month-divider agenda grouping

Browse Source 
Extracted the grouping algorithm (previously duplicated between mobile.views.
CalendarView and management.views.EventListView's own "List" mode) into a
shared events.services.calendar.agenda_groups, and wired it into both --
plus mobile.coach_views.CoachScheduleView, the coach app's own upcoming-
events screen, which had no grouping at all before (one flat card). All
three now read identically and can't drift apart.

Also: give each management event-list row's kind badge a fixed width, so
titles start at the same horizontal position regardless of whether the row
says "Game" or "Tournament".

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Bernard Siebens
2026-08-23 17:27:56 +02:00
parent a13ab20a0f
commit 6f16737bd9
13 changed files with 211 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
management/views.py
View File

@@ -1,4 +1,3 @@
import itertools
from datetime import date, timedelta
from decimal import Decimal
@@ -38,7 +37,7 @@ from controlpanel.mixins import RedirectOnInvalidMixin
from controlpanel.services.statistics import club_attention, club_charts, club_statistics, unrostered_members
from events.models import Attendance, Event, EventReferee, EventSeries, Location, Opponent, RefereeSignup
from events.services.attendance import member_attendance_counts, member_attendance_sparkline, player_attendance_rankings, players_who_missed_recent_practices, team_attendance_rate, team_no_shows
from events.services.calendar import add_months, month_bounds, month_grid, season_grid, week_bounds, week_grid
from events.services.calendar import add_months, agenda_groups, month_bounds, month_grid, season_grid, week_bounds, week_grid
from events.services.competitions import CompetitionFetchError, fetch_game_info
from events.services.rbihf_import import RBIHFImportError, apply_plan, build_plan, extract_team_id, fetch_html
from events.services.recurrence import cancel_occurrence, detach_occurrence, generate_occurrences, propagate_series
@@ -2473,36 +2472,15 @@ class EventListView(ClubStaffRequiredMixin, ListView):
return grid, calendar_nav
def _list_groups(self, events, show_past):
"""The same This week/Next week/by-month agenda grouping mobile.views.
CalendarView uses (see that view's own docstring for the algorithm) --
applied to whichever page of `events` is actually being shown, so
pagination and grouping don't fight each other. Past mode (show_past=1,
already descending) skips the this/next-week special-casing -- those
labels only make sense for what's ahead -- and just groups straight
into months, most recent first."""
if not events:
return [], [], []
if show_past:
months = [{"month_start": month_start, "events": list(month_events)} for month_start, month_events in itertools.groupby(events, key=lambda event: timezone.localtime(event.start).date().replace(day=1))]
return [], [], months
today = timezone.localdate()
_this_week_start, this_week_end = week_bounds(today)
next_week_end = this_week_end + timedelta(days=7)
this_week, next_week, later = [], [], []
for event in events:
event_date = timezone.localtime(event.start).date()
if event_date <= this_week_end:
this_week.append(event)
elif event_date <= next_week_end:
next_week.append(event)
else:
later.append(event)
later_months = [{"month_start": month_start, "events": list(month_events)} for month_start, month_events in itertools.groupby(later, key=lambda event: timezone.localtime(event.start).date().replace(day=1))]
return this_week, next_week, later_months
"""The shared This week/Next week/by-month agenda grouping (events.
services.calendar.agenda_groups, also behind mobile.views.CalendarView
and mobile.coach_views.CoachScheduleView) -- applied to whichever page
of `events` is actually being shown, so pagination and grouping don't
fight each other. Past mode (show_past=1, already descending) skips
the this/next-week special-casing -- those labels only make sense for
what's ahead -- and just groups straight into months, most recent
first."""
return agenda_groups(events, show_past=show_past)
def get_context_data(self, **kwargs):
club, user = self.request.club, self.request.user