Added room to presentations.

diff --git a/eventos/models.py b/eventos/models.py
index 36f17f8..122ae34 100644 (file)
--- a/eventos/models.py
+++ b/eventos/models.py
@@ -168,12 +168,14 @@ class Trabalho(models.Model):
     dia = models.DateField()
     time_start = models.TimeField()
     time_end = models.TimeField()
+    room = models.IntegerField()
 
     class Admin:
         fields = (
             (None, {'fields': ('titulo', 'evento', 'categoria', 'tipo',
                 'palestrante', 'descricao_curta', 'descricao_longa',
-                'recursos', 'aprovado', 'dia', 'time_start', 'time_end')}),
+                'recursos', 'aprovado', 'dia', 'time_start', 'time_end',
+               'room')}),
         )
 
     def __str__(self):

diff --git a/sql/add_room.sql b/sql/add_room.sql
new file mode 100644 (file)
index 0000000..b880ac2
--- /dev/null
+++ b/sql/add_room.sql
@@ -0,0 +1 @@
+ALTER TABLE eventos_trabalho ADD "room" integer;

diff --git a/views.py b/views.py
index f5de357..5c0a8e4 100644 (file)
--- a/views.py
+++ b/views.py
@@ -421,7 +421,7 @@ def dados_palestra(request, codigo):
 @enable_login_form
 def programacao(request):
     try:
-        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia','time_start')}
+        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia', 'time_start', 'room')}
     except ObjectDoesNotExist:
         d = {}
     return build_response(request, 'programacao.html',d)
@@ -430,7 +430,7 @@ def programacao(request):
 @staff_member_required
 def grade(request):
     try:
-        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia', 'time_start')}
+        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia', 'time_start', 'room')}
     except ObjectDoesNotExist:
         d = {}
     return build_response(request, 'grade.html', d)