diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index 9b0e69d72..e999f0b8d 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -11,6 +11,7 @@ from django.utils.translation import ugettext_lazy as _ from sapl.base.models import Autor, TipoAutor from sapl.comissoes.models import (Comissao, Composicao, DocumentoAcessorio, Participacao, Reuniao, Periodo) +from sapl.materia.models import PautaReuniao from sapl.parlamentares.models import Legislatura, Mandato, Parlamentar from sapl.utils import FileFieldCheckMixin @@ -383,6 +384,13 @@ class ReuniaoForm(ModelForm): return self.cleaned_data +class PautaReuniaoForm(forms.ModelForm): + + class Meta: + model = PautaReuniao + exclude = ['reuniao'] + + class DocumentoAcessorioCreateForm(FileFieldCheckMixin, forms.ModelForm): parent_pk = forms.CharField(required=False) # widget=forms.HiddenInput()) diff --git a/sapl/comissoes/urls.py b/sapl/comissoes/urls.py index f22f32e1d..5e48ee891 100644 --- a/sapl/comissoes/urls.py +++ b/sapl/comissoes/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import include, url from sapl.comissoes.views import (CargoCrud, ComissaoCrud, ComposicaoCrud, DocumentoAcessorioCrud, MateriasTramitacaoListView, ParticipacaoCrud, - PeriodoComposicaoCrud, ReuniaoCrud, TipoComissaoCrud, get_participacoes_comissao) + PeriodoComposicaoCrud, ReuniaoCrud, TipoComissaoCrud, get_participacoes_comissao, + AdicionaPautaView, RemovePautaView) from .apps import AppConfig @@ -17,6 +18,9 @@ urlpatterns = [ url(r'^comissao/(?P\d+)/materias-em-tramitacao$', MateriasTramitacaoListView.as_view(), name='materias_em_tramitacao'), + url(r'^comissao/(?P\d+)/pauta/add', AdicionaPautaView.as_view(), name='pauta_add'), + url(r'^comissao/(?P\d+)/pauta/remove', RemovePautaView.as_view(), name='pauta_remove'), + url(r'^sistema/comissao/cargo/', include(CargoCrud.get_urls())), url(r'^sistema/comissao/periodo-composicao/', include(PeriodoComposicaoCrud.get_urls())),