WIP

norma/forms.py

@@ -1,12 +1,13 @@
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Fieldset, Layout
 from django import forms
+from django.core.exceptions import ObjectDoesNotExist
 from django.forms import ModelForm
 from django.utils.safestring import mark_safe
 
 import crispy_layout_mixin
 from crispy_layout_mixin import form_actions
-from materia.models import TipoMateriaLegislativa
+from materia.models import MateriaLegislativa, TipoMateriaLegislativa
 
 from .models import NormaJuridica
 
@@ -97,7 +98,7 @@ class NormaJuridicaForm(ModelForm):
 
     numero_materia = forms.CharField(label='Número', required=False)
 
-    ano_materia = forms.CharField(label='Ano', required=False)
+    ano_materia = forms.CharField(label='Ano', required=False,)
 
     class Meta:
         model = NormaJuridica
@@ -120,6 +121,21 @@ class NormaJuridicaForm(ModelForm):
                   'texto_integral',
                   ]
 
+    def clean(self):
+        data = super(NormaJuridicaForm, self).clean()
+
+        if self.cleaned_data['tipo_materia']:
+            try:
+                materia = MateriaLegislativa.objects.get(
+                        tipo=self.cleaned_data['tipo_materia'],
+                        numero=self.cleaned_data['numero_materia'],
+                        ano=self.cleaned_data['ano_materia'])
+            except ObjectDoesNotExist:
+                msg = 'Matéria adicionada não existe!'
+                raise forms.ValidationError(msg)
+
+        return data
+
     def __init__(self, *args, **kwargs):
 
         row1 = crispy_layout_mixin.to_row(

norma/views.py

@@ -2,10 +2,10 @@ from datetime import datetime
 
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse, reverse_lazy
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
-from django.views.generic import CreateView, FormView, ListView
+from django.views.generic import CreateView, FormView, ListView, UpdateView
 
 from compilacao.views import IntegracaoTaView
 from crud import Crud, make_pagination
@@ -24,13 +24,8 @@ legislacao_citada_crud = Crud(LegislacaoCitada, '')
 
 class NormaPesquisaView(FormView):
     template_name = "norma/pesquisa.html"
-
-    def get_success_url(self):
-        return reverse('normajuridica:norma_pesquisa')
-
-    def get(self, request, *args, **kwargs):
-        form = NormaJuridicaPesquisaForm()
-        return self.render_to_response({'form': form})
+    success_url = "normajuridica:norma_pesquisa"
+    form_class = NormaJuridicaPesquisaForm
 
     def post(self, request, *args, **kwargs):
         form = NormaJuridicaPesquisaForm(request.POST)
@@ -120,74 +115,49 @@ class PesquisaNormaListView(ListView):
 class NormaIncluirView(CreateView):
     template_name = "norma/normajuridica_incluir.html"
     form_class = NormaJuridicaForm
-
-    def get_success_url(self):
-        return reverse('normajuridica:list')
-
-    def get(self, request, *args, **kwargs):
-        form = NormaJuridicaForm()
-        return self.render_to_response({'form': form})
-
-    def post(self, request, *args, **kwargs):
-        form = self.get_form()
-
-        if form.is_valid():
-            norma = form.save(commit=False)
-
-            if form.cleaned_data['tipo_materia']:
-                try:
-                    materia = MateriaLegislativa.objects.get(
-                        tipo_id=form.cleaned_data['tipo_materia'],
-                        numero=form.cleaned_data['numero_materia'],
-                        ano=form.cleaned_data['ano_materia'])
-                except ObjectDoesNotExist:
-                    msg = 'Matéria adicionada não existe!'
-                    messages.add_message(request, messages.INFO, msg)
-                    return self.render_to_response({'form': form})
-                else:
-                    norma.materia = materia
-            norma.timestamp = datetime.now()
-            norma.save()
-            return HttpResponseRedirect(self.get_success_url())
-        else:
-            return self.render_to_response({'form': form})
-
-
-class NormaEditView(CreateView):
+    success_url = reverse_lazy('normajuridica:list')
+
+    def form_valid(self, form):
+        norma = form.save(commit=False)
+        norma.timestamp = datetime.now()
+        if form.cleaned_data['tipo_materia']:
+            materia = MateriaLegislativa.objects.get(
+                            tipo_id=form.data['tipo_materia'],
+                            numero=form.data['numero_materia'],
+                            ano=form.data['ano_materia'])
+            norma.materia = materia
+        norma.save()
+        return HttpResponseRedirect(self.get_success_url())
+        
+
+class NormaEditView(UpdateView):
     template_name = "norma/normajuridica_incluir.html"
     form_class = NormaJuridicaForm
+    model = NormaJuridica
+    success_url = reverse_lazy('normajuridica:list')
 
-    def get(self, request, *args, **kwargs):
-        norma = NormaJuridica.objects.get(id=self.kwargs['pk'])
-        form = NormaJuridicaForm(instance=norma)
-        return self.render_to_response({'form': form})
-
-    def post(self, request, *args, **kwargs):
+    def get_initial(self):
+        data = super(NormaEditView, self).get_initial()
         norma = NormaJuridica.objects.get(id=self.kwargs['pk'])
-        form = NormaJuridicaForm(instance=norma, data=request.POST)
-
-        if form.is_valid():
-            if form.data['tipo_materia']:
-                try:
-                    materia = MateriaLegislativa.objects.get(
-                        tipo_id=form.data['tipo_materia'],
-                        numero=form.data['numero_materia'],
-                        ano=form.data['ano_materia'])
-                except ObjectDoesNotExist:
-                    msg = 'Matéria adicionada não existe!'
-                    messages.add_message(request, messages.INFO, msg)
-                    return self.render_to_response({'form': form})
-                else:
-                    norma.materia = materia
-            norma = form.save(commit=False)
-            norma.timestamp = datetime.now()
-            norma.save()
-            return HttpResponseRedirect(self.get_success_url())
-        else:
-            return self.render_to_response({'form': form})
-
-    def get_success_url(self):
-        return reverse('normajuridica:list')
+        if norma.materia:
+            data.update({
+                'tipo_materia': norma.materia.tipo,
+                'numero_materia': norma.materia.numero,
+                'ano_materia': norma.materia.ano,
+            })
+        return data
+
+    def form_valid(self, form):
+        norma = form.save(commit=False)
+        norma.timestamp = datetime.now()
+        if form.cleaned_data['tipo_materia']:
+            materia = MateriaLegislativa.objects.get(
+                            tipo_id=form.data['tipo_materia'],
+                            numero=form.data['numero_materia'],
+                            ano=form.data['ano_materia'])
+            norma.materia = materia
+        norma.save()
+        return HttpResponseRedirect(self.get_success_url())
 
 
 class NormaTaView(IntegracaoTaView):