hopefully better events view

fowl/game/templates/events.html

@@ -15,18 +15,20 @@ match details:</p>
 
 <div class="accordion" id="accordion">
 
-{% regroup points by match.event as event_list %}
+{% for event in events.values %}
-{% for event in event_list %}
 
 <div class="accordion-group">
     <div class="accordion-heading">
         <a class="accordion-toggle event-title" data-toggle="collapse"
-            data-parent="#accordion" href="#event-{{event.grouper.id}}">
+            data-parent="#accordion" href="#event-{{event.id}}">
-            {{event.grouper.name}} - {{event.grouper.date}}
+            {{event.name}} - {{event.date}}
         </a>
+        {% for team,score in event.scores.iteritems %}
+        {{team}}: {{score}}
+        {% endfor %}
     </div>
 
-    <div id="event-{{event.grouper.id}}" class="accordion-body collapse in">
+    <div id="event-{{event.id}}" class="accordion-body collapse in">
     <div class="accordion-inner">
     <table class="table">
         <thead>
@@ -36,13 +38,12 @@ match details:</p>
           </tr>
         </thead>
         <tbody>
-        {% regroup event.list by match as match_list %}
+            {% for match, tp_list in event.match_list.items %}
-        {% for match in match_list %}
         <tr>
-            <td>{{match.grouper}}</td>
+            <td>{{match}}</td>
             <td>
                 <ul>
-                    {% for tp in match.list %}
+                    {% for tp in tp_list %}
                     {% if tp.points %}
                     <li> {{tp.team}} received {{tp.points}}
                         point{{tp.points|pluralize}} for {{tp.star}}

fowl/game/views.py

@@ -1,12 +1,24 @@
+from collections import defaultdict
 from django.shortcuts import render
 from fowl.game.models import TeamPoints
 
+
 def events(request):
+    events = {}
     points = TeamPoints.objects.filter().order_by('match',
                                                   'team').select_related()
-    totals = TeamPoints.objects.values('match__event',
+    for tp in points:
-                                   'team__name').annotate(points=Sum('points'))
+        event_id = tp.match.event_id
-    return render(request, "events.html", {'points': points})
+        if event_id not in events:
+            events[event_id] = tp.match.event
+            events[event_id].scores = {}
+            events[event_id].match_list = {}
+        events[event_id].match_list.setdefault(tp.match, []
+                                               ).append(tp)
+        events[event_id].scores.setdefault(tp.team.name, 0)
+        events[event_id].scores[tp.team.name] += tp.points
+    return render(request, "events.html", {'events': events})
+
 
 def stables(request):
     return render(request, "stables.html")