Added room to presentations.

[cascardo/eventmanager.git] / views.py

diff --git a/views.py b/views.py
index edd63e4..5c0a8e4 100644 (file)
--- a/views.py
+++ b/views.py
@@ -22,6 +22,7 @@ from django.template import RequestContext, Context, loader
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import Group, User
 from django.contrib.auth import authenticate, login
+from django.contrib.admin.views.decorators import staff_member_required
 from django.newforms import form_for_instance
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
@@ -420,11 +421,19 @@ def dados_palestra(request, codigo):
 @enable_login_form
 def programacao(request):
     try:
-        d = {'aprovadas': Trabalho.objects.filter(aprovado=True)}
+        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia', 'time_start', 'room')}
     except ObjectDoesNotExist:
         d = {}
     return build_response(request, 'programacao.html',d)
 
+@enable_login_form
+@staff_member_required
+def grade(request):
+    try:
+        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia', 'time_start', 'room')}
+    except ObjectDoesNotExist:
+        d = {}
+    return build_response(request, 'grade.html', d)
 
 @enable_login_form
 def chamada_trabalhos(request):