Merge branch 'dev-gamechanger' into dev

# Conflicts:
#	gamecard/templates/gamecard/gamecard.html

gamecard/views.py

@@ -2,6 +2,8 @@
 import vcr
 from django.shortcuts import render
 
+import gamechanger.models as GcModels
+import gamechanger.utils.gamechanger
 from teamsnap.models import Opponent, Team
 from teamsnap.utils import get_teamsnap_client
 
@@ -62,6 +64,12 @@ def gamecard(request, team_id, event_id):
     ts_availability_lookup = {m.data["id"]: m for m in ts_availabilities}
     ts_lineup_entries_lookup = {m.data["member_id"]: m for m in ts_lineup_entries}
 
+    stats = gamechanger.utils.gamechanger.stats(request)
+    stats_lookup = {
+        GcModels.Player.objects.filter(id=k).first().teamsnap_member_id: stat_row
+        for k, stat_row in stats.items()
+    }
+
     members = []
 
     for member in ts_members:
@@ -91,6 +99,7 @@ def gamecard(request, team_id, event_id):
                             ts_availabilities_past,
                         )
                     )[:4],
+                    "stats": stats_lookup.get(member.data["id"]),
                 }
             )