Show the published line-up on the member event view instead of RSVP buttons
Once a game's line-up is published, "Your answers" switches to a read-only status pill and a new Line-up card shows every unit/slot; a SELECTED member can still report they can no longer make it, which flips them to Absent and notifies the team's managers immediately (the closed-deadline guard doesn't apply here, since a published line-up is usually well past it). Also shows the full date for the "Meet" time, not just the hour. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ECGMEwrc2k4D8VQuwjstj9
This commit is contained in:
@@ -7,9 +7,11 @@ through rather than touching the models directly.
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from club.services.access import event_season
|
||||
from events.models import Attendance, LineupSlot
|
||||
from members.models import Member
|
||||
from notifications.services import notify_members
|
||||
from teams.models import StaffAssignment
|
||||
|
||||
#: Attendance statuses that mean "not actually available" -- these members
|
||||
#: stay exactly as they are on publish, never flipped to NOT_SELECTED, and
|
||||
@@ -56,3 +58,17 @@ def publish_lineup(lineup):
|
||||
notify_members(selected_members, club=lineup.event.club, title=_("Line-up published"), body=body, source=lineup.event)
|
||||
|
||||
return lineup
|
||||
|
||||
|
||||
def notify_dropout(event, member, note):
|
||||
"""A player who was SELECTED in a published line-up reporting, after the
|
||||
fact, that they can no longer make it (mobile.views.EventDetailView.post's
|
||||
"dropout" status) -- unlike an ordinary pre-deadline Out, the roster is
|
||||
already locked in, so this goes straight to whoever can still act on it:
|
||||
every current-season manager of the event's own teams (management
|
||||
position, not every staffer -- a physio can't swap a line-up slot)."""
|
||||
manager_ids = StaffAssignment.objects.filter(team__in=event.teams.all(), position__management_position=True, season=event_season(event)).values_list("member_id", flat=True).distinct()
|
||||
managers = Member.objects.filter(pk__in=manager_ids)
|
||||
if managers:
|
||||
body = _("%(member)s can no longer make it to %(event)s: “%(note)s”") % {"member": member.get_full_name(), "event": event.title, "note": note}
|
||||
notify_members(managers, club=event.club, title=_("Line-up dropout"), body=body, source=event)
|
||||
|
||||
@@ -16,7 +16,7 @@ from club.services.onboarding import mark_bypassed, mark_complete
|
||||
from features.models import Maintenance
|
||||
from members.models import Group, GroupMembership, Member
|
||||
from notifications.models import Notification
|
||||
from teams.models import Position, RefereeLevel, RefereeProfile, Team, TeamMembership
|
||||
from teams.models import Position, RefereeLevel, RefereeProfile, StaffAssignment, Team, TeamMembership
|
||||
|
||||
from .admin import EventAdminForm
|
||||
from .models import Attendance, Competition, Event, EventReferee, EventSeries, Lineup, LineupSlot, LineupUnit, Location, Opponent
|
||||
@@ -34,7 +34,7 @@ from .services import (
|
||||
team_no_shows,
|
||||
)
|
||||
from .services.calendar import add_months, month_bounds, month_grid, season_grid, week_bounds, week_grid
|
||||
from .services.lineup import clear_slot, place_member, publish_lineup
|
||||
from .services.lineup import clear_slot, notify_dropout, place_member, publish_lineup
|
||||
from .services.rbihf_import import RBIHFImportError, apply_plan, build_plan, extract_team_id, parse_fixtures, suggested_location, suggested_opponent
|
||||
from .services.referees import RefereeAssignmentError, add_external_referee, assign_referee, conflicting_events, eligible_referees, needs_referee_management, remove_referee, set_referee_fee
|
||||
from .tasks import send_deadline_reminders
|
||||
@@ -466,6 +466,28 @@ class LineupServiceTests(EventsTestBase):
|
||||
notified_member_ids = set(Notification.objects.filter(member__in=[self.alice, self.bob]).values_list("member_id", flat=True))
|
||||
self.assertEqual(notified_member_ids, {self.alice.pk})
|
||||
|
||||
def test_notify_dropout_notifies_the_teams_managers(self):
|
||||
event, _lineup, _unit, _slot = self.make_game_with_lineup()
|
||||
manager = Member.objects.create(first_name="Cara", last_name="Coach")
|
||||
management_position = Position.objects.create(club=self.club, name="Head coach", short_name="HC", staff_position=True, management_position=True)
|
||||
StaffAssignment.objects.create(team=self.team, member=manager, season=self.season, position=management_position)
|
||||
|
||||
notify_dropout(event, self.alice, "Twisted an ankle")
|
||||
|
||||
notification = Notification.objects.get(member=manager)
|
||||
self.assertIn(self.alice.get_full_name(), notification.body)
|
||||
self.assertIn("Twisted an ankle", notification.body)
|
||||
|
||||
def test_notify_dropout_does_not_notify_non_management_staff(self):
|
||||
event, _lineup, _unit, _slot = self.make_game_with_lineup()
|
||||
physio = Member.objects.create(first_name="Pat", last_name="Physio")
|
||||
physio_position = Position.objects.create(club=self.club, name="Physio", short_name="PH", staff_position=True, management_position=False)
|
||||
StaffAssignment.objects.create(team=self.team, member=physio, season=self.season, position=physio_position)
|
||||
|
||||
notify_dropout(event, self.alice, "Twisted an ankle")
|
||||
|
||||
self.assertFalse(Notification.objects.filter(member=physio).exists())
|
||||
|
||||
|
||||
class RosterChangeSyncTests(EventsTestBase):
|
||||
def test_adding_roster_member_syncs_future_events(self):
|
||||
|
||||
Reference in New Issue
Block a user