From 9a3039ba3d629d923245dfd01cbae87bdab37e19 Mon Sep 17 00:00:00 2001
From: ulyssesBML <ulysses3353@gmail.com>
Date: Thu, 30 Jan 2020 14:55:02 -0300
Subject: [PATCH] =?UTF-8?q?Adaptando=20solu=C3=A7=C3=A3o=20para=20leitura?=
 =?UTF-8?q?=20de=20materias=20ordem=20e=20expediente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/sessao/urls.py  |  2 +-
 sapl/sessao/views.py | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py
index 3e5dd67d7..8d30a377b 100644
--- a/sapl/sessao/urls.py
+++ b/sapl/sessao/urls.py
@@ -198,7 +198,7 @@ urlpatterns = [
     url(r'^sessao/(?P<pk>\d+)/matordemdia/leitura/(?P<oid>\d+)/(?P<mid>\d+)$',
         OrdemDiaLeituraView.as_view(), name='leituraod'),
 
-    url(r'^sessao/(?P<pk>\d+)/(?P<iso>\d+)/(?P<oid>\d+)/retirar-leitura$',
+    url(r'^sessao/(?P<pk>\d+)/(?P<iso>\d+)/(?P<oid>\d+)/(?P<page>\d+)/retirar-leitura$',
         retirar_leitura, name='retirar_leitura'),
     
 ]
diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py
index 156aa9fab..4d528a2db 100755
--- a/sapl/sessao/views.py
+++ b/sapl/sessao/views.py
@@ -4537,21 +4537,31 @@ class AbstractLeituraView(FormView):
         return super().form_valid(form)
 
     def get_success_url(self):
+        page = ''
+        if 'page' in self.request.GET:
+            page = '?page={}'.format(self.request.GET['page'])
+        
         pk = self.kwargs['pk']
         if self.expediente:
             url = reverse('sapl.sessao:expedientemateria_list',
-                          kwargs={'pk': pk})
+                          kwargs={'pk': pk}) + page
         else:
             url = reverse('sapl.sessao:ordemdia_list',
-                          kwargs={'pk': pk})
+                          kwargs={'pk': pk}) + page
         return url
 
     def cancel_url(self):
+        page = 1
+        if 'page' in self.request.GET:
+            page = self.request.GET['page']
         url = reverse('sapl.sessao:retirar_leitura',
                       kwargs={
                           'pk': self.kwargs['pk'],
                           'iso': 1 if not self.expediente else 0,
-                          'oid': self.kwargs['oid']})
+                          'oid': self.kwargs['oid'],
+                          'page': page
+                          },
+                    )
         return url
 
 
@@ -4565,22 +4575,25 @@ class OrdemDiaLeituraView(AbstractLeituraView):
 
 @permission_required('sessao.change_expedientemateria',
                      'sessao.change_ordemdia')
-def retirar_leitura(request, pk, iso, oid):
+def retirar_leitura(request, pk, iso, oid, page):
+    aux_page = ''
+    if page != '1':
+        aux_page = '?page={}'.format(page)
+
     is_ordem = bool(int(iso))
     if not is_ordem:
         ordem_expediente = ExpedienteMateria.objects.get(id=oid)
         RegistroLeitura.objects.filter(
             materia=ordem_expediente.materia, expediente=ordem_expediente).delete()
         succ_url = reverse('sapl.sessao:expedientemateria_list',
-                           kwargs={'pk': pk})
+                           kwargs={'pk': pk}) + aux_page
     else:
         ordem_expediente = OrdemDia.objects.get(id=oid)
         RegistroLeitura.objects.filter(
             materia=ordem_expediente.materia, ordem=ordem_expediente).delete()
         succ_url = reverse('sapl.sessao:ordemdia_list',
-                           kwargs={'pk': pk})
+                           kwargs={'pk': pk}) + aux_page
     ordem_expediente.resultado = ""
     ordem_expediente.votacao_aberta = False
     ordem_expediente.save()
-
     return HttpResponseRedirect(succ_url)