From: Thadeu Lima de Souza Cascardo Date: Fri, 28 Sep 2007 11:49:45 +0000 (-0300) Subject: Merge branch 'master' of /var/www/emsl2007/eventmanager/ X-Git-Url: http://git.cascardo.info/?p=cascardo%2Feventmanager.git;a=commitdiff_plain;h=d0f8a3ab75f2c71f442beb5fd5cb9852ac75a4d9;hp=-c Merge branch 'master' of /var/www/emsl2007/eventmanager/ Conflicts: forms.py settings.py templates/meus_trabalhos.html views.py --- d0f8a3ab75f2c71f442beb5fd5cb9852ac75a4d9 diff --combined views.py index 58e9a37,077786f..b74f4fc --- a/views.py +++ b/views.py @@@ -17,19 -17,26 +17,35 @@@ License along with this program; if not 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.forms import AuthenticationForm - from django.contrib.auth import login + from django.contrib.auth import authenticate, login + from django.newforms import form_for_instance + from django.core.mail import EmailMessage from django.db import transaction + from django.http import get_host + from django.conf import settings from eventmanager.decorators import enable_login_form - from eventmanager.forms import * 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 datetime import datetime + import sha + + FROM_EMAIL = 'Emsl 2007 ' ++>>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py def build_response(request, template, extra={}): """ @@@ -48,8 -55,10 +64,10 @@@ news = Noticia.objects.order_by('-data_criacao') menus = Menu.objects.all() index_sections = Secao.objects.filter(index=True) + login_failed = 'login_failed' in request.GET c = {'news': news, 'menu': menus, - 'index_sections': index_sections} + 'index_sections': index_sections, + 'login_failed': login_failed} c.update(extra) return render_to_response(template, Context(c), context_instance=RequestContext(request)) @@@ -65,76 -74,213 +83,213 @@@ def index(request) def cadastro_palestrante(request): form = CadastroPalestrante(request.POST or None) ok = False + c = {'form': form} if request.POST and form.is_valid(): cd = form.cleaned_data badattr = form.errors - wrong = False - if not cd['telefone'] and not cd['celular']: - badattr['telefone_comercial'] = ['Algum número de telefone ' - 'precisa ser informado'] - wrong = True - - # don't save duplicated users... + group = Group.objects.get_or_create(name='palestrantes')[0] + + user = User(username=cd['nome_usuario'], email=cd['email']) + user.set_password(cd['senha']) + user.is_active = False + user.save() + user.groups.add(group) + + p = Palestrante() + p.usuario = user + + p.nome = cd['nome_completo'] + p.email = cd['email'] + p.telefone = cd['telefone'] + p.celular = cd['celular'] + p.instituicao = cd['instituicao'] + p.rua = cd['rua'] + p.numero = cd['numero'] + p.bairro = cd['bairro'] + p.cidade = cd['cidade'] + p.uf = cd['uf'] + p.minicurriculo = cd['minicurriculo'] + p.curriculo = cd['curriculo'] + p.save() + + for i in cd.get('area_interesse', []): + p.area_interesse.add(i) + + pid = p.id + md5_email = sha.new(cd['email']).hexdigest() + email = '%s <%s>' % (cd['nome_completo'], cd['email']) + link = '%s/verificar?c=%s&c1=%s' % (get_host(request), + pid, md5_email) + t = loader.get_template('email-palestrante.html') + ec = Context(dict(fulano=['nome_usuario'], link=link)) + + # to be shown in template... + c.update({'email': email}) try: - User.objects.get(username=cd['nome_usuario']) - badattr['nome_usuario'] = ['Este nome de usuário já existe!'] - wrong = True - transaction.rollback() - except User.DoesNotExist: - pass - - if cd['senha'] != cd['senha_2']: - badattr['senha_2'] = ['A senha não confere'] - wrong = True + # XXX: maybe is not a good so prety put things hardcoded =( + m = EmailMessage('Encontro Mineiro de Software Livre', + t.render(ec), FROM_EMAIL, [email]) + m.send() + except Exception: + badattr['email'] = \ + ['Desculpe mas não pude enviar o email de confirmação'] transaction.rollback() - - if not wrong: - group = Group.objects.get_or_create(name='palestrantes')[0] - - user = User(username=cd['nome_usuario'], email=cd['email']) - user.set_password(cd['senha']) - user.save() - user.groups.add(group) - - p = Palestrante() - p.usuario = user - - p.nome = cd['nome_completo'] - p.email = cd['email'] - p.telefone = cd['telefone'] - p.celular = cd['celular'] - p.instituicao = cd['instituicao'] - p.rua = cd['rua'] - p.numero = cd['numero'] - p.bairro = cd['bairro'] - p.cidade = cd['cidade'] - p.uf = cd['uf'] - p.minicurriculo = cd['minicurriculo'] - p.curriculo = cd['curriculo'] - p.save() - - for i in cd.get('area_interesse', []): - p.area_interesse.add(i) - - fakepost = request.POST.copy() - fakepost['username'] = cd['nome_usuario'] - fakepost['password'] = cd['senha'] - - manipulator = AuthenticationForm(request) - errors = manipulator.get_validation_errors(fakepost) - got_user = manipulator.get_user() - login(request, got_user) - transaction.commit() + else: ok = True - c = {'form': form, 'ok': ok} + c.update({'ok': ok}) + transaction.commit() + return build_response(request, 'cadastro.html', c) @enable_login_form def inscricao(request): + return build_response(request, 'inscricao.html') + + + @enable_login_form + @transaction.commit_manually + def inscricao_individual(request): form = Inscricao(request.POST or None) - return build_response(request, 'inscricao.html', {'form': form}) + ok = False + if request.POST and form.is_valid(): + cd = form.cleaned_data + group = Group.objects.get_or_create(name='participantes')[0] + + user = User(username=cd['nome_usuario'], email=cd['email']) + user.set_password(cd['senha']) + user.is_active = False + user.save() + user.groups.add(group) + p = Participante() + p.usuario = user + p.nome = cd['nome_completo'] + p.rg = cd['rg'] + p.email = cd['email'] + p.rua = cd['rua'] + p.numero = cd['numero'] + p.bairro = cd['bairro'] + p.cidade = cd['cidade'] + p.uf = cd['uf'] + p.cep = cd['cep'] + p.refbanco = 0 + 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']) + login(request, u) + transaction.commit() + ok = True + + c = {'form': form, 'ok': ok} + return build_response(request, 'inscricao_individual.html', c) + + + @enable_login_form + @transaction.commit_manually + def inscricao_caravana(request): + form = InscricaoCaravana(request.POST or None) + ok = False + if request.POST and form.is_valid(): + cd = form.cleaned_data + group = Group.objects.get_or_create(name='participantes')[0] + + user = User(username=cd['nome_usuario'], email=cd['email']) + user.set_password(cd['senha']) + user.is_active = False + user.save() + user.groups.add(group) + + p = Participante() + p.usuario = user + p.nome = cd['nome_completo'] + p.rg = cd['rg'] + p.email = cd['email'] + p.rua = cd['rua'] + p.numero = cd['numero'] + p.bairro = cd['bairro'] + p.cidade = cd['cidade'] + p.uf = cd['uf'] + p.cep = cd['cep'] + p.refbanco = 0 + p.telefone = cd['telefone'] + p.home_page = cd['home_page'] + p.comercial = False # yeah, always false! + p.cpf_cnpj = '' + p.save() + + c = Caravana() + c.coordenador = p + c.participantes = cd['lista_nomes'] + c.save() + + ok = True + u = authenticate(username=cd['nome_usuario'], password=cd['senha']) + login(request, u) + transaction.commit() + + c = {'form': form, 'ok': ok} + return build_response(request, 'inscricao_caravana.html', c) + + + @enable_login_form + def inscricao_boleto(request): + # dynamic values of the form + now = datetime.now() + today = datetime.date(now) + first_date = datetime.date(datetime(2007, 10, 12)) + c = {} + + p = request.user.participante_set.get() + ca = p.caravana_set.all() and p.caravana_set.get() + + initial = {} + + if p.refbanco == 0: + # o número refTran deve ser gerado a cada novo boleto e deve ser único, + # mesmo para os testes + refs = [x.refbanco for x in Participante.objects.all()] + new_ref = len(refs) + while new_ref in refs or new_ref <= settings.MIN_REF_TRAN: + new_ref += 1 + + # este dado precisa ser persistente para que possa ser comparado logo acima + p.refbanco = new_ref + p.save() + else: + new_ref = p.refbanco + + initial['refTran'] = '1458197%s' % str(new_ref).zfill(10) + if today < first_date: + initial['dtVenc'] = '12102007' + if not p.comercial: + initial['valor'] = '3500' + else: + initial['valor'] = '8000' + + # caso seja uma caravana... + if ca and len(ca.parsed_participantes()) >= 10: + # sim, o valor aqui é 25 -- Desconto + initial['valor'] = '%s00' % (len(ca.parsed_participantes()) * 25) + c.update({'caravana': 1}) + else: + initial['valor'] = '5000' + initial['dtVenc'] = '17102007' + + initial['nome'] = p.nome + initial['endereco'] = '%s, %s - %s' % (p.rua, p.numero, p.bairro) + initial['cidade'] = p.cidade + initial['uf'] = p.uf + initial['cep'] = p.cep + + form = Boleto(request.POST or None, initial=initial) + c.update({'form': form}) + c.update(initial) + return build_response(request, 'inscricao_boleto.html', c) @login_required @@@ -152,7 -298,7 +307,7 @@@ def submeter_trabalho(request) t.descricao_curta = cd['descricao_curta'] t.descricao_longa = cd['descricao_longa'] t.recursos = cd['recursos'] - t.evento = Evento.objects.get(pk=1) # let the hammer play arround! + t.evento = Evento.objects.get(pk=1) # XXX: let the hammer play arround! t.save() logged_in = request.user.palestrante_set.get() @@@ -179,6 -325,6 +334,32 @@@ 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): @@@ -204,24 -350,51 +385,52 @@@ 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): + 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) + + form = Formulario(request.POST or None) + if request.POST and 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) + + c = {'formulario': form} + return build_response(request, 'editar_trabalho.html', c) + ++>>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py + @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