Skip to content

Commit

Permalink
Added 'more puzzles' functionality on the puzzles template
Browse files Browse the repository at this point in the history
  • Loading branch information
celeritas17 committed Feb 5, 2014
1 parent 89d1676 commit 9d7dc91
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 7 deletions.
2 changes: 1 addition & 1 deletion puzzles/templates/game_over.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h1>You Win!</h1>
<p>Score: {{score}}</p>
<div class="more_puzzles">
<a href="{% url 'puzzles.views.puzzle' puzzle_id|add:'1' %}">Next Puzzle!</a>
</div>
</div>
{% else %}
<h1>You Lose!</h1>
<p>Better luck next time</p>
Expand Down
6 changes: 5 additions & 1 deletion puzzles/templates/puzzles.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@ <h1><em>Start Snacking!</em></h1>
<small class="category">{{puzzle.category.category_name}}</small>
</a>
{% endfor %}
<a href="#" class="puzzle more"><h4>More Puzzles &gt;&gt;</h4></a>
{% if puzzles_left > puzzles_on_page %}
<a href="{% url 'puzzles.views.puzzles' next_position %}" class="puzzle more"><h4>More Puzzles &gt;&gt;</h4></a>
{% else %}
<a href="{% url 'puzzles.views.puzzles' orig_position %}" class="puzzle more"><h4>&lt;&lt;Back to List</h4></a>
{% endif %}
{% endblock %}
2 changes: 1 addition & 1 deletion puzzles/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

urlpatterns = patterns('puzzles.views',
url(r'^get/(?P<puzzle_id>\d+)/$', 'puzzle'),
url(r'^all/$', 'puzzles'),
url(r'^all/(?P<position>\d+)/$', 'puzzles'),
url(r'^endgame/$', 'endgame'),
)
20 changes: 17 additions & 3 deletions puzzles/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,22 @@ def puzzle(request, puzzle_id):
context.update(csrf(request))
return render_to_response('puzzle.html', context)

def puzzles(request):
def puzzles(request, position):
user = request.user
puzzles = Puzzle.objects.all()
context = {'puzzles': Puzzle.objects.all()[0:14], 'user': user}
position = int(position)
puzzles_on_page = 14
puzzles_left = len(Puzzle.objects.all()) - position
next_position = position + puzzles_on_page
orig_position = 0
context = {'puzzles': Puzzle.objects.all()[position:position+next_position],
'user': user,
'orig_position': 0,
'position': position,
'next_position': next_position,
'puzzles_on_page': puzzles_on_page,
'puzzles_left': puzzles_left,
}

return render_to_response('puzzles.html', context)

Expand All @@ -50,7 +62,9 @@ def endgame(request):
attempt_id = request.POST['attempt_id']
success = request.POST['winning']
score = request.POST['score']
context = {'success':success, 'puzzle_id': puzzle_id}
context = {'success': success,
'puzzle_id': puzzle_id,
}
if success == 'victory':
if int(attempt_id) > 0:
pa = PuzzleAttempt.objects.get(pk=attempt_id)
Expand Down
2 changes: 1 addition & 1 deletion templates/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>Logged Out</h2>
{% endif %}
<div class="buttons">
<div id="register"><h4><em><a href="{% url 'snacMan.views.register' %}">Register</a></em></h4></div>
<div id="play"><h4><em><a href="{% url 'puzzles.views.puzzles' %}">Play</a></em></h4></div>
<div id="play"><h4><em><a href="{% url 'puzzles.views.puzzles' 0 %}">Play</a></em></h4></div>
<div id="login"><h4><em><a href="{% url 'snacMan.views.login' %}">Login</a></em></h4></div>
</div>
{% endblock %}
Expand Down

0 comments on commit 9d7dc91

Please sign in to comment.