From 07cd2634a215f12af4816e27d6ea5e5f5ea3cb52 Mon Sep 17 00:00:00 2001 From: ricardocanela Date: Fri, 4 Oct 2019 12:44:53 -0300 Subject: [PATCH] adicionando modal para pesquisar codigo de proposicao por data --- sapl/materia/forms.py | 16 +++++++++++----- sapl/utils.py | 12 ++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 0f7283725..bfa3c4c09 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -40,11 +40,11 @@ from sapl.norma.models import (LegislacaoCitada, NormaJuridica, from sapl.parlamentares.models import Legislatura, Partido, Parlamentar from sapl.protocoloadm.models import (Anexado, DocumentoAdministrativo, Protocolo) -from sapl.utils import (autor_label, autor_modal, - ChoiceWithoutValidationField, - choice_anos_com_materias, FileFieldCheckMixin, - FilterOverridesMetaMixin, gerar_hash_arquivo, +from sapl.settings import MAX_DOC_UPLOAD_SIZE +from sapl.utils import (ChoiceWithoutValidationField, choice_anos_com_materias, + FileFieldCheckMixin, FilterOverridesMetaMixin, lista_anexados, MateriaPesquisaOrderingFilter, + autor_label, autor_modal, gerar_hash_arquivo, proposicao_modal, models_with_gr_for_model, qs_override_django_filter, RangeWidgetOverride, SEPARADOR_HASH_PROPOSICAO, validar_arquivo, YES_NO_CHOICES) @@ -115,10 +115,16 @@ class ReceberProposicaoForm(Form): def __init__(self, *args, **kwargs): row1 = to_row([('cod_hash', 12)]) + row2 = to_row( + [(Button('pesquisar-cod-proposicao', + 'Pesquisar Código de Proposicoes', + css_class='btn btn-primary btn-sm'), 4) + ]) self.helper = SaplFormHelper() self.helper.layout = Layout( Fieldset( - _('Incorporar Proposição'), row1, + _('Incorporar Proposição'), row1, row2, + HTML(proposicao_modal), form_actions(label='Buscar Proposição') ) ) diff --git a/sapl/utils.py b/sapl/utils.py index 04db352c7..4956ed161 100644 --- a/sapl/utils.py +++ b/sapl/utils.py @@ -136,6 +136,18 @@ autor_modal = ''' ''' +proposicao_modal = ''' + +''' def montar_row_autor(name): autor_row = to_row(