Added time to presentations and order by it

Presentations now have start and end time and they are ordered by it
after the day.

diff --git a/eventos/models.py b/eventos/models.py
index e5955b7..36f17f8 100644 (file)
--- a/eventos/models.py
+++ b/eventos/models.py
@@ -166,12 +166,14 @@ class Trabalho(models.Model):
     recursos = models.TextField()
     aprovado = models.BooleanField()
     dia = models.DateField()
     recursos = models.TextField()
     aprovado = models.BooleanField()
     dia = models.DateField()

+    time_start = models.TimeField()
+    time_end = models.TimeField()

 
     class Admin:
         fields = (
             (None, {'fields': ('titulo', 'evento', 'categoria', 'tipo',
                 'palestrante', 'descricao_curta', 'descricao_longa',
 
     class Admin:
         fields = (
             (None, {'fields': ('titulo', 'evento', 'categoria', 'tipo',
                 'palestrante', 'descricao_curta', 'descricao_longa',

-                'recursos', 'aprovado', 'dia')}),
+                'recursos', 'aprovado', 'dia', 'time_start', 'time_end')}),

         )
 
     def __str__(self):
         )
 
     def __str__(self):

diff --git a/views.py b/views.py
index d15746b..ca3443a 100644 (file)
--- a/views.py
+++ b/views.py
@@ -420,7 +420,7 @@ def dados_palestra(request, codigo):
 @enable_login_form
 def programacao(request):
     try:
 @enable_login_form
 def programacao(request):
     try:

-        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia')}
+        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia','time_start')}

     except ObjectDoesNotExist:
         d = {}
     return build_response(request, 'programacao.html',d)
     except ObjectDoesNotExist:
         d = {}
     return build_response(request, 'programacao.html',d)