diff --git a/fowl/game/models.py b/fowl/game/models.py index e2223db..2295101 100644 --- a/fowl/game/models.py +++ b/fowl/game/models.py @@ -246,6 +246,7 @@ class League(models.Model): class Team(models.Model): name = models.CharField(max_length=100) + color = models.CharField(max_length=50) login = models.OneToOneField(User, related_name='team') league = models.ForeignKey(League, related_name='teams') stars = models.ManyToManyField(Star, related_name='teams') diff --git a/fowl/game/templates/events.html b/fowl/game/templates/events.html index 59ea9ee..529bb45 100644 --- a/fowl/game/templates/events.html +++ b/fowl/game/templates/events.html @@ -19,7 +19,7 @@ PPVs, since the creation of this league.

{% for team,score in event.scores.iteritems %} - {{team}}: {{score}} + {{team}}: {{score}} {% endfor %} diff --git a/fowl/game/templates/stables.html b/fowl/game/templates/stables.html index 46566ee..fdf670e 100644 --- a/fowl/game/templates/stables.html +++ b/fowl/game/templates/stables.html @@ -50,7 +50,7 @@ {% for team in teams %} - {{team}} + {{team}} {% endfor %} diff --git a/fowl/game/views.py b/fowl/game/views.py index d2712d7..4c701be 100644 --- a/fowl/game/views.py +++ b/fowl/game/views.py @@ -16,8 +16,8 @@ def events(request, league_id): 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 + events[event_id].scores.setdefault(tp.team, 0) + events[event_id].scores[tp.team] += tp.points events = sorted(events.values(), key=lambda x: x.date, reverse=True) return render(request, "events.html", {'events': events, 'view': 'events'}) diff --git a/setup_league.py b/setup_league.py index 82383b8..f0a2234 100644 --- a/setup_league.py +++ b/setup_league.py @@ -19,9 +19,13 @@ james = User.objects.create_superuser('james', 'james.p.turk@gmail.com', 'james' erin = User.objects.create_user('erin', 'erin.braswell@gmail.com', 'erin') kevin = User.objects.create_user('kevin', 'kevin.wohlgenant@gmail.com', 'kevin') league = League.objects.create(name='Fire Pro Wrestling') -gm_punk = Team.objects.create(name='GM Punk', login=james, league=league) -awesome = Team.objects.create(name="I'm AWEsome!", login=kevin, league=league) -cobra = Team.objects.create(name='COBRA!', login=erin, league=league) +gm_punk = Team.objects.create(name='GM Punk', login=james, league=league, + color='#1540a4') +awesome = Team.objects.create(name="I'm AWEsome!", login=kevin, league=league, + color='#f5a506') +cobra = Team.objects.create(name='COBRA!', login=erin, league=league, + color='#05c405') + punks = ('cmpunk', 'markhenry', 'rtruth', 'codyrhodes', 'tensai', 'antoniocesaro', 'wadebarrett', 'aj', 'bethphoenix',