added a span to the add sandwich template

[~kgodey/maayanwich.git] / views.py

diff --git a/views.py b/views.py
index 6395205..b84a926 100644 (file)
--- a/views.py
+++ b/views.py
@@ -1,41 +1,43 @@
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404
 from django.contrib.auth.models import User
 from forms import SandwichForm, IngredientForm, NewUserForm
 from django.shortcuts import render_to_response
 from django.core.files.uploadedfile import SimpleUploadedFile
 from models import Sandwich, Ingredient
-from django.http import Http404
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.forms import AuthenticationForm
+from django.template import RequestContext
 import datetime
 
+def sidebar_context(request):
+       x = Sandwich.objects.order_by('-date_made')
+       if x.count() > 5:
+               sandwiches = x[:5]
+       else:
+               sandwiches = x
+       monthly = Sandwich.objects.dates('date_made', 'month')
+       return {'sandwiches': sandwiches, 'monthly': monthly, 'user': request.user}
+
 
 def add_sandwich(request):
-       if Sandwich.objects.count() > 5:
-               sandwiches = Sandwich.objects.order_by('date_made')[:5]
-       else:
-               sandwiches = Sandwich.objects.order_by('date_made')
        if request.user.is_authenticated():
                if request.method == 'POST': # If the form has been submitted...
                        form = SandwichForm(request.POST, request.FILES) # A form bound to the POST data
                        if form.is_valid(): # All validation rules pass
-                               newsandwich = form.save()
+                               newsandwich = form.save(commit=False)
+                               newsandwich.user = request.user
                                newsandwich.save()
                                thankshtml = "<p class=\"formthanks\">Thanks! Your sandwich has been added!</p>"
                                return HttpResponse(thankshtml) # Redirect after POST
                else:
-                       form = SandwichForm() # An unbound form
-               return render_to_response('sandwich.html', {'sform': form, 'sandwiches': sandwiches, 'user': request.user,})
+                       form = SandwichForm(initial={'user': request.user}) # An unbound form
+               return render_to_response('sandwich.html', {'sform': form,}, context_instance=RequestContext(request))
        else:
                thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
                return HttpResponse(thankshtml) # Redirect after POST
 
 def add_ingredient(request):
        if request.user.is_authenticated():
-               if Sandwich.objects.count() > 5:
-                       sandwiches = Sandwich.objects.order_by('date_made')[:5]
-               else:
-                       sandwiches = Sandwich.objects.order_by('date_made')
                if request.method == 'POST': # If the form has been submitted...
                        form = IngredientForm(request.POST) # A form bound to the POST data
                        if form.is_valid(): # All validation rules pass
@@ -46,7 +48,7 @@ def add_ingredient(request):
                else:
                        form = IngredientForm() # An unbound form
 
-               return render_to_response('ingredient.html', {'iform': form, 'sandwiches': sandwiches, 'user': request.user,})
+               return render_to_response('ingredient.html', {'iform': form,}, context_instance=RequestContext(request))
        else:
                thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
                return HttpResponse(thankshtml) # Redirect after POST
@@ -54,56 +56,41 @@ def add_ingredient(request):
 def all_sandwich(request):
        try:
                allsandwiches = Sandwich.objects.all()
-               if Sandwich.objects.count() > 5:
-                       sandwiches = Sandwich.objects.order_by('date_made')[:5]
-               else:
-                       sandwiches = Sandwich.objects.order_by('date_made')
        except Sandwich.DoesNotExist:
                raise Http404
-       return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches, 'sandwiches': sandwiches, 'user': request.user,})
+       return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches,}, context_instance=RequestContext(request))
 
 
-def baseview(request):
+def sandwich_month(request, year, month):
        try:
-               if Sandwich.objects.count() > 5:
-                       sandwiches = Sandwich.objects.order_by('date_made')[:5]
-                       allsandwiches = Sandwich.objects.all()
-               else:
-                       sandwiches = Sandwich.objects.order_by('date_made')
-                       allsandwiches = Sandwich.objects.all()
+               ms = Sandwich.objects.filter(date_made__month=month, date_made__year=year)
        except Sandwich.DoesNotExist:
                raise Http404
-       return render_to_response('base.html', {'sandwiches': sandwiches, 'all': allsandwiches,})
-
-
-def sandwich_month(request, year, month):
+       return render_to_response('allsandwiches.html', {'allsandwiches': ms,}, context_instance=RequestContext(request))
+       
+def current_home(request):
+       temp = Sandwich.objects.order_by('-date_made')[0]
+       curr_month = temp.date_made.month
+       curr_year = temp.date_made.year
        try:
-               ms = Sandwich.objects.filter(date_made__month=month, date_made__year=year)
-               if Sandwich.objects.count() > 5:
-                       sandwiches = Sandwich.objects.order_by('date_made')[:5]
-               else:
-                       sandwiches = Sandwich.objects.order_by('date_made')
+               ms = Sandwich.objects.filter(date_made__month=curr_month, date_made__year=curr_year)
        except Sandwich.DoesNotExist:
                raise Http404
-       return render_to_response('allsandwiches.html', {'allsandwiches': ms, 'sandwiches': sandwiches, 'user': request.user,})
+       return render_to_response('allsandwiches.html', {'allsandwiches': ms,}, context_instance=RequestContext(request))
 
 
 def specific_sandwich(request, slug):
        try:
                s = Sandwich.objects.get(slug=slug)
                if Sandwich.objects.count() > 5:
-                       sandwiches = Sandwich.objects.order_by('date_made')[:5]
+                       sandwiches = Sandwich.objects.order_by('-date_made')[:5]
                else:
-                       sandwiches = Sandwich.objects.order_by('date_made')
+                       sandwiches = Sandwich.objects.order_by('-date_made')
        except Sandwich.DoesNotExist:
                raise Http404
-       return render_to_response('onesandwich.html', {'s': s, 'sandwiches': sandwiches, 'user': request.user,})
+       return render_to_response('onesandwich.html', {'s': s,}, context_instance=RequestContext(request))
 
 def logout_view(request):
-       if Sandwich.objects.count() > 5:
-               sandwiches = Sandwich.objects.order_by('date_made')[:5]
-       else:
-               sandwiches = Sandwich.objects.order_by('date_made')
        if request.user.is_authenticated():
                logout(request)
                thankshtml = "<p class=\"formthanks\">You have been logged out.</p>"
@@ -115,9 +102,9 @@ def logout_view(request):
 
 def login_view(request):
        if Sandwich.objects.count() > 5:
-               sandwiches = Sandwich.objects.order_by('date_made')[:5]
+               sandwiches = Sandwich.objects.order_by('-date_made')[:5]
        else:
-               sandwiches = Sandwich.objects.order_by('date_made')
+               sandwiches = Sandwich.objects.order_by('-date_made')
        try:
                username = request.POST['username']
                password = request.POST['password']
@@ -135,14 +122,14 @@ def login_view(request):
                        return HttpResponse(thankshtml)
        except KeyError:
                aform = AuthenticationForm()
-               return render_to_response('login.html', {'aform': aform, 'sandwiches': sandwiches, 'user': request.user,})
+               return render_to_response('login.html', {'aform': aform,}, context_instance=RequestContext(request))
 
 
 def create_user(request):
        if Sandwich.objects.count() > 5:
-               sandwiches = Sandwich.objects.order_by('date_made')[:5]
+               sandwiches = Sandwich.objects.order_by('-date_made')[:5]
        else:
-               sandwiches = Sandwich.objects.order_by('date_made')
+               sandwiches = Sandwich.objects.order_by('-date_made')
        if request.user.is_authenticated():
                thankshtml = "<p class=\"formthanks\">You are already logged in!</p>"
                return HttpResponse(thankshtml)
@@ -168,4 +155,4 @@ def create_user(request):
                                return HttpResponse(thankshtml) # Redirect after POST   
        else:
                form = NewUserForm() # An unbound form
-               return render_to_response('newuser.html', {'cform': form, 'sandwiches': sandwiches, 'user': request.user,})
\ No newline at end of file
+               return render_to_response('newuser.html', {'cform': form,}, context_instance=RequestContext(request))
\ No newline at end of file