form working

sapl/sessao/forms.py

@@ -202,6 +202,9 @@ class RetiradaPautaForm(ModelForm):
     ordem = forms.ModelChoiceField(required=False,
                                    label='Matéria da Ordem do Dia',
                                    queryset=OrdemDia.objects.all())
+    materia = forms.ModelChoiceField(required=False,
+                                     widget=forms.HiddenInput(),
+                                     queryset=MateriaLegislativa.objects.all())
 
     class Meta:
         model = RetiradaPauta
@@ -210,7 +213,8 @@ class RetiradaPautaForm(ModelForm):
                   'parlamentar',
                   'tipo_de_retirada',
                   'data',
-                  'observacao']
+                  'observacao',
+                  'materia']
 
     def __init__(self, *args, **kwargs):
 
@@ -250,20 +254,20 @@ class RetiradaPautaForm(ModelForm):
         if not self.is_valid():
             return self.cleaned_data
 
+        if self.cleaned_data['ordem']:
+            self.cleaned_data['materia'] = self.cleaned_data['ordem'].materia
+        elif self.cleaned_data['expediente']:
+            self.cleaned_data['materia'] = self.cleaned_data['expediente'].materia
+
+
         sessao_plenaria = self.instance.sessao_plenaria
         if self.cleaned_data['data'] < sessao_plenaria.data_inicio:
             raise ValidationError(_("Data de retirada de pauta anterior à abertura da Sessão"))
         if sessao_plenaria.data_fim and self.cleaned_data['data'] > sessao_plenaria.data_fim:
             raise ValidationError(_("Data de retirada de pauta posterior ao encerramento da Sessão"))
-        import ipdb;
-        ipdb.set_trace()
+
         return self.cleaned_data
 
-    def save(self, commit=False):
-        retirada = super().save(True)
-        retirada.materia = retirada.ordem.materia
-        import ipdb;ipdb.set_trace()
-        return retirada
 
 class BancadaForm(ModelForm):
 

sapl/sessao/migrations/0028_auto_20181031_0902.py

@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('materia', '0032_auto_20181022_1743'),
         ('parlamentares', '0025_auto_20180924_1724'),
-        ('sessao', '0028_auto_20181024_0848'),
+        ('sessao', '0029_auto_20181024_0952'),
     ]
 
     operations = [

sapl/sessao/migrations/0029_auto_20181024_0952.py

@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sessao', '0028_auto_20181031_0902'),
+        ('sessao', '0028_auto_20181024_0848'),
     ]
 
     operations = [

sapl/sessao/migrations/0030_auto_20181113_1149.py

@@ -10,7 +10,7 @@ import django.utils.timezone
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sessao', '0029_auto_20181024_0952'),
+        ('sessao', '0028_auto_20181031_0902'),
     ]
 
     operations = [