Browse Source

Quase funcionando

pull/2876/head
Cesar Carvalho 7 years ago
parent
commit
7afef484d6
  1. 28
      sapl/materia/forms.py
  2. 21
      sapl/materia/migrations/0051_auto_20190703_1414.py
  3. 2
      sapl/materia/models.py
  4. 8
      sapl/materia/views.py
  5. 10
      sapl/templates/materia/despachoinicial_detail.html
  6. 3
      sapl/templates/materia/despachoinicial_list.html

28
sapl/materia/forms.py

@ -1115,7 +1115,7 @@ def filtra_tramitacao_destino_and_status(status, destino):
'materia_id', flat=True) 'materia_id', flat=True)
class DespachoInicialForm(forms.Form): class DespachoInicialCreateForm(forms.Form):
comissao = forms.ModelMultipleChoiceField( comissao = forms.ModelMultipleChoiceField(
queryset=Comissao.objects.filter(ativa=True), queryset=Comissao.objects.filter(ativa=True),
widget=forms.CheckboxSelectMultiple()) widget=forms.CheckboxSelectMultiple())
@ -1144,7 +1144,7 @@ class DespachoInicialForm(forms.Form):
)) ))
def clean(self): def clean(self):
super(DespachoInicialForm, self).clean() super().clean()
comissoes = self.cleaned_data.get('comissao') comissoes = self.cleaned_data.get('comissao')
if not comissoes: if not comissoes:
@ -1169,6 +1169,30 @@ class DespachoInicialForm(forms.Form):
return self.cleaned_data return self.cleaned_data
class DespachoInicialForm(ModelForm):
comissao = forms.ModelChoiceField(
queryset=Comissao.objects.filter(ativa=True), label=_('Comissão'))
class Meta:
model = DespachoInicial
fields = ['comissao']
def clean(self):
super(DespachoInicialForm, self).clean()
if not self.is_valid():
return self.cleaned_data
if DespachoInicial.objects.filter(
materia=self.instance.materia,
comissao=self.cleaned_data['comissao'],
).exclude(pk=self.instance.pk).exists():
msg = _('Já existe um Despacho cadastrado para %s' %
self.cleaned_data['comissao'])
raise ValidationError(msg)
return self.cleaned_data
class AutoriaForm(ModelForm): class AutoriaForm(ModelForm):
tipo_autor = ModelChoiceField(label=_('Tipo Autor'), tipo_autor = ModelChoiceField(label=_('Tipo Autor'),

21
sapl/materia/migrations/0051_auto_20190703_1414.py

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-07-03 17:14
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('materia', '0050_auto_20190521_1148'),
]
operations = [
migrations.AlterField(
model_name='despachoinicial',
name='comissao',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comissoes.Comissao', verbose_name='Comissão'),
),
]

2
sapl/materia/models.py

@ -485,7 +485,7 @@ class AssuntoMateria(models.Model):
@reversion.register() @reversion.register()
class DespachoInicial(models.Model): class DespachoInicial(models.Model):
materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE) materia = models.ForeignKey(MateriaLegislativa, on_delete=models.CASCADE)
comissao = models.ForeignKey(Comissao, on_delete=models.CASCADE) comissao = models.ForeignKey(Comissao, on_delete=models.CASCADE, verbose_name="Comissão")
class Meta: class Meta:
verbose_name = _('Despacho Inicial') verbose_name = _('Despacho Inicial')

8
sapl/materia/views.py

@ -47,7 +47,8 @@ from sapl.materia.forms import (AnexadaForm, AutoriaForm,
ConfirmarProposicaoForm, ConfirmarProposicaoForm,
DevolverProposicaoForm, LegislacaoCitadaForm, DevolverProposicaoForm, LegislacaoCitadaForm,
OrgaoForm, ProposicaoForm, TipoProposicaoForm, OrgaoForm, ProposicaoForm, TipoProposicaoForm,
TramitacaoForm, TramitacaoUpdateForm, MateriaPesquisaSimplesForm) TramitacaoForm, TramitacaoUpdateForm, MateriaPesquisaSimplesForm,
DespachoInicialCreateForm)
from sapl.norma.models import LegislacaoCitada from sapl.norma.models import LegislacaoCitada
from sapl.parlamentares.models import Legislatura from sapl.parlamentares.models import Legislatura
from sapl.protocoloadm.models import Protocolo from sapl.protocoloadm.models import Protocolo
@ -1492,7 +1493,7 @@ class AutoriaMultiCreateView(PermissionRequiredForAppCrudMixin, FormView):
class DespachoInicialMultiCreateView(PermissionRequiredForAppCrudMixin, FormView): class DespachoInicialMultiCreateView(PermissionRequiredForAppCrudMixin, FormView):
app_label = sapl.materia.apps.AppConfig.label app_label = sapl.materia.apps.AppConfig.label
form_class = DespachoInicialForm form_class = DespachoInicialCreateForm
template_name = 'materia/despachoinicial_multicreate_form.html' template_name = 'materia/despachoinicial_multicreate_form.html'
# @classmethod # @classmethod
@ -1538,9 +1539,6 @@ class DespachoInicialCrud(MasterDetailCrud):
help_topic = 'despacho_autoria' help_topic = 'despacho_autoria'
public = [RP_LIST, RP_DETAIL] public = [RP_LIST, RP_DETAIL]
# class CreateView(MasterDetailCrud.CreateView):
# form_class = DespachoInicialForm
class UpdateView(MasterDetailCrud.UpdateView): class UpdateView(MasterDetailCrud.UpdateView):
form_class = DespachoInicialForm form_class = DespachoInicialForm

10
sapl/templates/materia/despachoinicial_detail.html

@ -0,0 +1,10 @@
{% extends "crud/detail_detail.html" %}
{% load i18n common_tags crispy_forms_tags%}
{% block extra_js %}
<script language="Javascript">
$(document).ready(function() {
console.log("OI");
});
</script>
{% endblock extra_js %}

3
sapl/templates/materia/despachoinicial_list.html

@ -10,9 +10,6 @@
let new_url = '/materia/' + materia_id + '/despachoinicialmulti/create'; let new_url = '/materia/' + materia_id + '/despachoinicialmulti/create';
console.log(new_url); console.log(new_url);
href = botao_add.attr('href', new_url); href = botao_add.attr('href', new_url);
let tittle = $(".result-count").children().first().children().first().children().first().children().first().attr('tittle');
console.log(title);
}); });
</script> </script>
{% endblock %} {% endblock %}
Loading…
Cancel
Save