From 4f9071aab3eeb408f2c4a8409a0f00646badbd48 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Thu, 29 Aug 2019 09:19:08 -0300 Subject: [PATCH] Adiciona cancelamento de leitura --- sapl/sessao/forms.py | 2 +- sapl/sessao/views.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index e0215dd60..f259eebaf 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -1055,7 +1055,7 @@ class OrdemExpedienteLeituraForm(forms.ModelForm): [('observacao', 12)]) actions = [HTML('Cancelar')] + ' class="btn btn-warning">Cancelar Leitura')] self.helper = SaplFormHelper() self.helper.form_method = 'POST' diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 737406711..23348f751 100755 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -4425,6 +4425,15 @@ class AbstractLeituraView(FormView): return url def cancel_url(self): + if self.expediente: + ordem_expediente = ExpedienteMateria.objects.get(id=self.kwargs['oid']) + RegistroLeitura.objects.filter(materia=ordem_expediente.materia, expediente=ordem_expediente).delete() + else: + ordem_expediente = OrdemDia.objects.get(id=self.kwargs['oid']) + RegistroLeitura.objects.filter(materia=ordem_expediente.materia, ordem=ordem_expediente).delete() + ordem_expediente.resultado = "" + ordem_expediente.votacao_aberta = False + ordem_expediente.save() return self.get_success_url()