X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=views.py;h=73e5e3eb1de27224f1fbe885c2ecdb1071c8ac0a;hb=8c047e0436035610d8330c5fddc3cfb745e265bb;hp=ca3443ad98c6fe034135844dc075a81981098057;hpb=df12d99d9db80529f2c98240cd8bed5bd38612a5;p=cascardo%2Feventmanager.git

diff --git a/views.py b/views.py
index ca3443a..73e5e3e 100644
--- 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
@@ -419,12 +420,18 @@ def dados_palestra(request, codigo):
 
 @enable_login_form
 def programacao(request):
-    try:
-        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia','time_start')}
-    except ObjectDoesNotExist:
-        d = {}
+    ap = Trabalho.objects.filter(aprovado=True)
+    ord = ap.order_by('dia', 'time_start', 'room')
+    d = {'aprovadas': ord}
     return build_response(request, 'programacao.html',d)
 
+@enable_login_form
+@staff_member_required
+def grade(request):
+    ap = Trabalho.objects.filter(aprovado=True)
+    ord = ap.order_by('dia', 'time_start', 'room')
+    d = {'aprovadas': ord}
+    return build_response(request, 'grade.html', d)
 
 @enable_login_form
 def chamada_trabalhos(request):