X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=views.py;h=d15746b0bc7d21681ad39cd8cf47bd296a84f4f6;hb=c99b6d00e0f8bd84a9f90102a354a51ba460588a;hp=b74f4fc5852e74df7e668b6f57d4b2419ea8f5f4;hpb=d0f8a3ab75f2c71f442beb5fd5cb9852ac75a4d9;p=cascardo%2Feventmanager.git

diff --git a/views.py b/views.py
index b74f4fc..d15746b 100644
--- a/views.py
+++ b/views.py
@@ -17,17 +17,13 @@ License along with this program; if not, write to the
 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 """
-<<<<<<< HEAD/views.py
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext, Context
-=======
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext, Context, loader
->>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py
 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
@@ -36,16 +32,13 @@ from django.conf import settings
 from eventmanager.decorators import enable_login_form
 from eventmanager.conteudo.models import Noticia, Menu, Secao
 from eventmanager.eventos.models import *
-<<<<<<< HEAD/views.py
-from django.newforms import form_for_instance
-=======
 from eventmanager.forms import *
+from eventmanager.controllers import *
 
 from datetime import datetime
 import sha
 
 FROM_EMAIL = 'Emsl 2007 <noreply@minaslivre.org>'
->>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py
 
 def build_response(request, template, extra={}):
     """
@@ -334,32 +327,6 @@ def meus_trabalhos(request):
     c = {'trabalhos': t, 'palestrante': 1}
     return build_response(request, 'meus_trabalhos.html', c)
 
-<<<<<<< HEAD/views.py
-@login_required
-@user_passes_test(lambda u:u.palestrante_set.count() == 1, login_url='/')
-def editar_trabalho(request,codigo):
-    try:
-        p = Palestrante.objects.get(usuario=request.user)
-    except Palestrante.DoesNotExist:
-        # não palestrante...
-        c = {'palestrante': 0}
-        return build_response(request, 'meus_trabalhos.html', c)
-    trabalho = get_object_or_404(Trabalho, id=codigo,palestrante=p)
-    Formulario = form_for_instance(trabalho)
-    if request.method == 'POST':
-        form = Formulario(request.POST)
-        if form.is_valid():
-            form.save()
-            t = Trabalho.objects.filter(palestrante=p)
-            c = {'trabalhos': t, 'palestrante': 1}
-            c['editado_sucesso']=trabalho.titulo
-            return build_response(request, 'meus_trabalhos.html', c)
-    else:
-        form = Formulario()
-    
-    c = {'formulario':form}
-    return build_response(request, 'editar_trabalho.html', c)
-=======
 @login_required
 @user_passes_test(lambda u:u.palestrante_set.count() == 1, login_url='/')
 def editar_trabalho(request,codigo):
@@ -409,8 +376,6 @@ def editar_trabalho(request, codigo):
     c = {'formulario': form}
     return build_response(request, 'editar_trabalho.html', c)
 
->>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py
-
 @login_required
 def meus_dados(request):
     try:
@@ -433,6 +398,34 @@ def meus_dados(request):
     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')}
+    except ObjectDoesNotExist:
+        d = {}
+    return build_response(request, 'programacao.html',d)
+
+
 @enable_login_form
 def chamada_trabalhos(request):
     return build_response(request, 'chamada_trabalhos.html')