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

reverse sort matches, make pages use a league

Browse Source
This commit is contained in:
James Turk 2012-05-28 00:41:16 -04:00
parent b3707c0386
commit 9330b885ad
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fowl/game/templates/base.html
View File

@ -40,11 +40,8 @@
<a class="brand" href="#">FOWL</a>
<div class="nav-collapse">
<ul class="nav">
<li><a href="index.html">Home</a></li>
<li class="active"><a href="events.html">Events</a></li>
<li><a href="stables.html">Stables</a></li>
<li><a href="roster.html">Roster</a></li>
<li><a href="stars.html">Star Pages</a></li>
<li {% if view == "league" %}class="active"{%endif%}><a href="{% url league 1 %}">League</a></li>
<li {% if view == "events" %}class="active"{%endif%}><a href="{% url events 1 %}">Events</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>

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

@ -9,7 +9,7 @@
PPVs, since the creation of this league.</p>
</header>
{% for event in events.values %}
{% for event in events %}
<div class="accordion-group">
<div class="accordion-heading">

8
fowl/game/urls.py
View File

@ -1,7 +1,9 @@
from django.conf.urls import patterns, include, url
urlpatterns = patterns('',
url(r'^events/$', 'fowl.game.views.events'),
url(r'^edit_event/$', 'fowl.game.views.edit_event'),
url(r'^stables/$', 'fowl.game.views.stables'),
url(r'events/(?P<league_id>\d+)/$', 'fowl.game.views.events',
name='events'),
url(r'league/(?P<league_id>\d+)/$', 'fowl.game.views.league',
name='league'),
url(r'^edit_event/$', 'fowl.game.views.edit_event', name='edit_event'),
)

23
fowl/game/views.py
View File

@ -4,10 +4,10 @@ from django.shortcuts import render, get_object_or_404
from fowl.game.models import Team, TeamPoints
def events(request):
def events(request, league_id):
events = {}
points = TeamPoints.objects.filter().order_by('match',
'team').select_related()
points = TeamPoints.objects.filter(team__league_id=league_id).order_by(
'match', 'team').select_related()
for tp in points:
event_id = tp.match.event_id
if event_id not in events:
@ -18,7 +18,8 @@ def events(request):
).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})
events = sorted(events.values(), key=lambda x: x.date, reverse=True)
return render(request, "events.html", {'events': events, 'view': 'events'})
def edit_event(request, event_id=None):
if event_id:
@ -29,10 +30,14 @@ def edit_event(request, event_id=None):
return render(request, "edit_event.html", {"event": event})
def stables(request):
context = { 'belts': ['ic', 'us', 'heavyweight', 'wwe']
}
teams = list(Team.objects.all().prefetch_related('stars'))
def league(request, league_id):
context = {
'view': 'league',
'belts': ['ic', 'us', 'heavyweight', 'wwe']
}
teams = list(Team.objects.filter(league__id=league_id)
.prefetch_related('stars'))
context['teams'] = teams
context['star_sets'] = izip_longest(*(team.stars.all().order_by("division") for team in teams))
context['star_sets'] = izip_longest(*(team.stars.all().order_by("division")
for team in teams))
return render(request, "stables.html", context)