X-Git-Url: http://git.cascardo.info/?p=cascardo%2Feventmanager.git;a=blobdiff_plain;f=views.py;h=6b370ff2d2d914535bc30dccfaa39a804919da24;hp=4b5f55733f8f2193c380f6d2751448117b5fe837;hb=b909209c1ef96b1f577bb5a270d33d8a6a273a7d;hpb=14a6a9174b47d8ce677224e346dca9b4808a07e5

diff --git a/views.py b/views.py
index 4b5f557..6b370ff 100644
--- a/views.py
+++ b/views.py
@@ -22,6 +22,7 @@ from django.template import RequestContext, Context, loader
 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.contrib.admin.views.decorators import staff_member_required
 from django.newforms import form_for_instance
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
@@ -234,7 +235,7 @@ def inscricao_boleto(request):
     # dynamic values of the form
     now = datetime.now()
     today = datetime.date(now)
-    first_date = datetime.date(datetime(2007, 10, 12))
+    first_date = datetime.date(datetime(2007, 10, 16))
     c = {}
 
     p = request.user.participante_set.get()
@@ -257,8 +258,8 @@ def inscricao_boleto(request):
         new_ref = p.refbanco
 
     initial['refTran'] = '1458197%s' % str(new_ref).zfill(10)
-    if today < first_date:
-        initial['dtVenc'] = '12102007'
+    if today <= first_date:
+        initial['dtVenc'] = '16102007'
         if not p.comercial:
             initial['valor'] = '3500'
         else:
@@ -323,11 +324,34 @@ def meus_trabalhos(request):
         # não palestrante...
         c = {'palestrante': 0}
         return build_response(request, 'meus_trabalhos.html', c)
-
     t = Trabalho.objects.filter(palestrante=p)
     c = {'trabalhos': t, 'palestrante': 1}
     return build_response(request, 'meus_trabalhos.html', c)
 
+@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='/')
@@ -353,7 +377,6 @@ def editar_trabalho(request, codigo):
     c = {'formulario': form}
     return build_response(request, 'editar_trabalho.html', c)
 
-
 @login_required
 def meus_dados(request):
     try:
@@ -397,12 +420,18 @@ def dados_palestra(request, codigo):
 
 @enable_login_form
 def programacao(request):
-    try:
-        d = {'aprovadas': Trabalho.objects.filter(aprovado=True)}
-    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):
+    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):