X-Git-Url: http://git.cascardo.info/?p=cascardo%2Feventmanager.git;a=blobdiff_plain;f=views.py;h=6b370ff2d2d914535bc30dccfaa39a804919da24;hp=edd63e49bc5c15b6f0c31916aadd357b8c4536e9;hb=HEAD;hpb=32f262da230ba8f1a278de5cfbec098588782ea9 diff --git a/views.py b/views.py index edd63e4..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: @@ -419,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):