jpt-archive/fowl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

colors

Browse Source
This commit is contained in:
James Turk 2012-05-28 03:21:20 -04:00
parent 68b369c5bd
commit 7576380e6a
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fowl/game/models.py
View File

@ -246,6 +246,7 @@ class League(models.Model):
class Team(models.Model): class Team(models.Model):
name = models.CharField(max_length=100) name = models.CharField(max_length=100)
color = models.CharField(max_length=50)
login = models.OneToOneField(User, related_name='team') login = models.OneToOneField(User, related_name='team')
league = models.ForeignKey(League, related_name='teams') league = models.ForeignKey(League, related_name='teams')
stars = models.ManyToManyField(Star, related_name='teams') stars = models.ManyToManyField(Star, related_name='teams')

2
fowl/game/templates/events.html
View File

@ -19,7 +19,7 @@ PPVs, since the creation of this league.</p>
</a> </a>
<span class="score-container"> <span class="score-container">
{% for team,score in event.scores.iteritems %} {% for team,score in event.scores.iteritems %}
<span class="label" style="background-color: #00aa00;">{{team}}: {{score}}</span> <span class="label" style="background-color: {{team.color}};">{{team}}: {{score}}</span>
{% endfor %} {% endfor %}
</span> </span>
</div> </div>

2
fowl/game/templates/stables.html
View File

@ -50,7 +50,7 @@
<thead> <thead>
<tr> <tr>
{% for team in teams %} {% for team in teams %}
<th>{{team}}</th> <th style="background-color: {{team.color}}; color: #eeeeee;">{{team}}</th>
{% endfor %} {% endfor %}
</tr> </tr>
</thead> </thead>

4
fowl/game/views.py
View File

@ -16,8 +16,8 @@ def events(request, league_id):
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.name, 0) events[event_id].scores.setdefault(tp.team, 0)
events[event_id].scores[tp.team.name] += 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'}) return render(request, "events.html", {'events': events, 'view': 'events'})

10
setup_league.py
View File

@ -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') erin = User.objects.create_user('erin', 'erin.braswell@gmail.com', 'erin')
kevin = User.objects.create_user('kevin', 'kevin.wohlgenant@gmail.com', 'kevin') kevin = User.objects.create_user('kevin', 'kevin.wohlgenant@gmail.com', 'kevin')
league = League.objects.create(name='Fire Pro Wrestling') league = League.objects.create(name='Fire Pro Wrestling')
gm_punk = Team.objects.create(name='GM Punk', login=james, league=league) gm_punk = Team.objects.create(name='GM Punk', login=james, league=league,
awesome = Team.objects.create(name="I'm AWEsome!", login=kevin, league=league) color='#1540a4')
cobra = Team.objects.create(name='COBRA!', login=erin, league=league) 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', punks = ('cmpunk', 'markhenry', 'rtruth', 'codyrhodes',
'tensai', 'antoniocesaro', 'wadebarrett', 'aj', 'bethphoenix', 'tensai', 'antoniocesaro', 'wadebarrett', 'aj', 'bethphoenix',