From 512ff956ff7be72301cd469fd824ae26d9d63111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Fri, 22 Mar 2019 18:08:13 -0300 Subject: [PATCH] =?UTF-8?q?Apresentar=20erro=20-=20datas=20n=C3=A3o=20pree?= =?UTF-8?q?nchidas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/forms.py | 4 +--- sapl/materia/views.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index e5caec886..4b75e134a 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1151,8 +1151,6 @@ class AnexadaEmLoteFilterSet(django_filters.FilterSet): self.filters['tipo'].label = 'Tipo de Matéria' self.filters['data_apresentacao'].label = 'Data (Inicial - Final)' - self.form.fields['tipo'].required = True - self.form.fields['data_apresentacao'].required = True row1 = to_row([('tipo', 12)]) row2 = to_row([('data_apresentacao', 12)]) @@ -1160,7 +1158,7 @@ class AnexadaEmLoteFilterSet(django_filters.FilterSet): self.form.helper = SaplFormHelper() self.form.helper.form_method = 'GET' self.form.helper.layout = Layout( - Fieldset(_('Matéria Anexada em Lote'), + Fieldset(_('Pesquisa de Matérias'), row1, row2, form_actions(label='Pesquisar'))) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 30f4cd7c9..6ec1a9785 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -2065,8 +2065,21 @@ class MateriaAnexadaEmLoteView(PermissionRequiredMixin, FilterView): context['subnav_template_name'] = 'materia/subnav.yaml' context['title'] = _('Matérias Anexadas em Lote') + # Verifica se os campos foram preenchidos - if not self.filterset.form.is_valid(): + if not self.request.GET.get('tipo', " "): + msg =_('Por favor, selecione um tipo de matéria.') + messages.add_message(self.request, messages.ERROR, msg) + + if not self.request.GET.get('data_apresentacao_0', " ") or not self.request.GET.get('data_apresentacao_1', " "): + msg =_('Por favor, preencha as datas.') + messages.add_message(self.request, messages.ERROR, msg) + + return context + + if not self.request.GET.get('data_apresentacao_0', " ") or not self.request.GET.get('data_apresentacao_1', " "): + msg =_('Por favor, preencha as datas.') + messages.add_message(self.request, messages.ERROR, msg) return context qr = self.request.GET.copy()