fixed bug where multiple lineup_entries for person didn't show up

This commit is contained in:
2022-06-06 16:43:59 -05:00
parent ae476ee717
commit b927157bb0

View File

@@ -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: (