From b927157bb0d4a762982d57efa8fbe3eedcfb64c4 Mon Sep 17 00:00:00 2001 From: Tony Date: Mon, 6 Jun 2022 16:43:59 -0500 Subject: [PATCH] fixed bug where multiple lineup_entries for person didn't show up --- teamsnap/views.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/teamsnap/views.py b/teamsnap/views.py index 823aeaf..a7a62df 100644 --- a/teamsnap/views.py +++ b/teamsnap/views.py @@ -247,19 +247,35 @@ def edit_lineup(request, event_ids, team_id): members = [] - for member in ts_members: + for lineup_entry in ts_lineup_entries: members.append( { - "member": getattr(member, "data"), + "member": getattr(ts_member_lookup[lineup_entry.data['member_id']],'data'), "availability": getattr( - ts_availability_lookup.get(member.data["id"], {}), "data", {} + ts_availability_lookup.get(lineup_entry.data['member_id'], {}), "data", {} ), "lineup_entry": getattr( - ts_lineup_entries_lookup.get(member.data["id"], {}), "data", {} + lineup_entry, "data", {} ), } ) + in_lineup_already = [m['member'] for m in members] + + for member in ts_members: + if not member.data in in_lineup_already: + members.append( + { + "member": getattr(member, "data"), + "availability": getattr( + ts_availability_lookup.get(member.data["id"], {}), "data", {} + ), + "lineup_entry": getattr( + ts_lineup_entries_lookup.get(member.data["id"], {}), "data", {} + ), + } + ) + members = sorted( members, key=lambda d: (