some cleanup & order by match__id
This commit is contained in:
parent
254699d859
commit
a38f15945e
@ -81,8 +81,7 @@ class Event(models.Model):
|
|||||||
|
|
||||||
match = Match.objects.create(event=self,
|
match = Match.objects.create(event=self,
|
||||||
title_at_stake=title_at_stake,
|
title_at_stake=title_at_stake,
|
||||||
notes=notes
|
notes=notes)
|
||||||
)
|
|
||||||
for team in teams:
|
for team in teams:
|
||||||
mt = MatchTeam.objects.create(match=match)
|
mt = MatchTeam.objects.create(match=match)
|
||||||
if not isinstance(team, (list, tuple)):
|
if not isinstance(team, (list, tuple)):
|
||||||
|
@ -10,19 +10,20 @@ def events(request, league_id):
|
|||||||
leagues = League.objects.all()
|
leagues = League.objects.all()
|
||||||
events = {}
|
events = {}
|
||||||
points = TeamPoints.objects.filter(team__league_id=league_id).order_by(
|
points = TeamPoints.objects.filter(team__league_id=league_id).order_by(
|
||||||
'match', 'team').select_related()
|
'match__id', 'team').select_related()
|
||||||
for tp in points:
|
for tp in points:
|
||||||
event_id = tp.match.event_id
|
event_id = tp.match.event_id
|
||||||
if event_id not in events:
|
if event_id not in events:
|
||||||
events[event_id] = tp.match.event
|
events[event_id] = tp.match.event
|
||||||
events[event_id].scores = {}
|
events[event_id].scores = {}
|
||||||
events[event_id].match_list = {}
|
events[event_id].match_list = {}
|
||||||
events[event_id].match_list.setdefault(tp.match, []
|
events[event_id].match_list.setdefault(tp.match, []).append(tp)
|
||||||
).append(tp)
|
|
||||||
events[event_id].scores.setdefault(tp.team, 0)
|
events[event_id].scores.setdefault(tp.team, 0)
|
||||||
events[event_id].scores[tp.team] += tp.points
|
events[event_id].scores[tp.team] += tp.points
|
||||||
events = sorted(events.values(), key=lambda x: x.date, reverse=True)
|
events = sorted(events.values(), key=lambda x: x.date, reverse=True)
|
||||||
return render(request, "events.html", {'events': events, 'view': 'events', 'league': league, 'leagues':leagues})
|
return render(request, "events.html",
|
||||||
|
{'events': events, 'view': 'events', 'league': league,
|
||||||
|
'leagues':leagues})
|
||||||
|
|
||||||
|
|
||||||
def edit_event(request, event):
|
def edit_event(request, event):
|
||||||
|
Loading…
Reference in New Issue
Block a user