code cleanup

[cascardo/eventmanager.git] / views.py

diff --git a/views.py b/views.py
index 010afaf..0e3082e 100644 (file)
--- a/views.py
+++ b/views.py
@@ -146,7 +146,6 @@ def inscricao_individual(request):
     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'])
@@ -168,6 +167,8 @@ def inscricao_individual(request):
         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'])
@@ -208,6 +209,8 @@ def inscricao_caravana(request):
         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()
@@ -238,7 +241,7 @@ def inscricao_boleto(request):
     initial = {}
 
     if p.refbanco == 0:
-        # o número refran deve ser gerado a cada novo boleto e deve ser único,
+        # 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)
@@ -253,8 +256,11 @@ def inscricao_boleto(request):
 
     initial['refTran'] = '1458197%s' % str(new_ref).zfill(10)
     if today < first_date:
-        initial['valor'] = '3500'
         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:
@@ -348,22 +354,24 @@ def editar_trabalho(request, codigo):
 
 @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()
 
-    for name, field in form.fields.items():
-        field.initial = getattr(palestrante, name)
+    FormKlass = form_for_instance(entity)
 
+    # 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