Cleaned up schedule view functions

[cascardo/eventmanager.git] / views.py

diff --git a/views.py b/views.py
index 3850ff9..73e5e3e 100644 (file)
--- a/views.py
+++ b/views.py
@@ -420,20 +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):
-    try:
-               d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia', 'time_start')}
-       except ObjectDoesNotExist:
-               d = {}
-       return build_response(request, 'grade.html', d)
+    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):