Added time to presentations and order by it

[cascardo/eventmanager.git] / views.py

diff --git a/views.py b/views.py
index 4208dfa..ca3443a 100644 (file)
--- a/views.py
+++ b/views.py
@@ -23,6 +23,7 @@ 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.newforms import form_for_instance
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
 from django.db import transaction
 from django.http import get_host
@@ -32,6 +33,7 @@ from eventmanager.decorators import enable_login_form
 from eventmanager.conteudo.models import Noticia, Menu, Secao
 from eventmanager.eventos.models import *
 from eventmanager.forms import *
+from eventmanager.controllers import *
 
 from datetime import datetime
 import sha
@@ -168,6 +170,7 @@ def inscricao_individual(request):
         p.telefone = cd['telefone']
         p.home_page = cd['home_page']
         p.comercial = cd['inscricao_comercial']
+        p.cpf_cnpj = cd['cpf_cnpj']
         p.save()
 
         u = authenticate(username=cd['nome_usuario'], password=cd['senha'])
@@ -209,6 +212,7 @@ def inscricao_caravana(request):
         p.telefone = cd['telefone']
         p.home_page = cd['home_page']
         p.comercial = False # yeah, always false!
+        p.cpf_cnpj = ''
         p.save()
 
         c = Caravana()
@@ -372,25 +376,54 @@ def editar_trabalho(request, codigo):
     c = {'formulario': form}
     return build_response(request, 'editar_trabalho.html', c)
 
-
 @login_required
 def meus_dados(request):
-    form = EditarPalestrante(request.POST or None)
-    palestrante = request.user.palestrante_set.get()
-    ok = False
+    try:
+        entity = request.user.palestrante_set.get()
+    except Palestrante.DoesNotExist:
+        entity = request.user.participante_set.get()
+
+    FormKlass = form_for_instance(entity)
 
-    for name, field in form.fields.items():
-        field.initial = getattr(palestrante, name)
+    # ugly hammer to hide some fields...
+    del FormKlass.base_fields['usuario']
 
+    ok = False
+    form = FormKlass(request.POST or None)
     if request.POST and form.is_valid():
-        cd = form.cleaned_data
-        for name, field in form.fields.items():
-            setattr(palestrante, name, cd[name])
-        palestrante.save()
+        form.save()
         ok = True
 
-    c = {'form': form, 'ok': ok}
-    return build_response(request, 'editar_palestrante.html', c)
+    c = {'form': form, 'ok': ok, 'title': entity.__class__.__name__}
+    return build_response(request, 'editar_usuario.html', c)
+
+
+@enable_login_form
+def dados_palestrante(request, codigo):
+    d = {}
+    try:
+        d = {'dados_usuario': Palestrante.objects.get(id=codigo)}
+    except ObjectDoesNotExist:
+        d = {}
+    return build_response(request, 'dados_palestrante.html', d)
+
+
+@enable_login_form
+def dados_palestra(request, codigo):
+    try:
+        d = {'dados_palestra': Trabalho.objects.get(id=codigo)}
+    except ObjectDoesNotExist:
+        d = {}
+    return build_response(request, 'dados_palestra.html',d)
+
+
+@enable_login_form
+def programacao(request):
+    try:
+        d = {'aprovadas': Trabalho.objects.filter(aprovado=True).order_by('dia','time_start')}
+    except ObjectDoesNotExist:
+        d = {}
+    return build_response(request, 'programacao.html',d)
 
 
 @enable_login_form