From 8057306e15cdc0b6f1f31afd95669957365f4c83 Mon Sep 17 00:00:00 2001
From: Victor Fabre <victorfabre@me.com>
Date: Mon, 4 Jun 2018 11:59:34 -0300
Subject: [PATCH] Fix #1949 (#1950)

---
 sapl/relatorios/views.py |  3 ++-
 sapl/utils.py            | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py
index 9f46450b8..0bad27889 100644
--- a/sapl/relatorios/views.py
+++ b/sapl/relatorios/views.py
@@ -795,7 +795,8 @@ def relatorio_sessao_plenaria(request, pk):
 
     for idx in range(len(lst_expedientes)):
         txt_expedientes = lst_expedientes[idx]['txt_expediente']
-        txt_expedientes = TrocaTag(txt_expedientes, '<table', 'table>', 6, 6, 'expedientes')
+        txt_expedientes = TrocaTag(txt_expedientes, '<table', 'table>', 6, 6,
+        'expedientes', '</para><blockTable style = "', 'blockTable><para>')
         lst_expedientes[idx]['txt_expediente'] = txt_expedientes
 
     pdf = pdf_sessao_plenaria_gerar.principal(
diff --git a/sapl/utils.py b/sapl/utils.py
index 69ea53dfc..b674481c3 100644
--- a/sapl/utils.py
+++ b/sapl/utils.py
@@ -688,7 +688,7 @@ def ExtraiTag(texto, posicao):
             return i + 1
 
 
-def TrocaTag(texto, startTag, endTag, sizeStart, sizeEnd, styleName):
+def TrocaTag(texto, startTag, endTag, sizeStart, sizeEnd, styleName, subinitiTag, subendTag):
     textoSaida = ''
     insideTag = 0
     i = 0
@@ -697,16 +697,19 @@ def TrocaTag(texto, startTag, endTag, sizeStart, sizeEnd, styleName):
     if '<tbody>' in texto:
         texto = texto.replace('<tbody>', '')
         texto = texto.replace('</tbody>', '')
+    if '<p>' in texto:
+        texto = texto.replace('<p>', '')
+        texto = texto.replace('</p>', '')
     while (i < len(texto)):
         shard = texto[i:i + sizeStart]
         if (shard == startTag):
             i = ExtraiTag(texto, i)
-            textoSaida += '</para><blockTable style = "' + styleName + '">'
+            textoSaida += subinitiTag + styleName + '">'
             insideTag = 1
         else:
             if (insideTag == 1):
                 if (texto[i:i + sizeEnd] == endTag):
-                    textoSaida += 'blockTable><para>'
+                    textoSaida += subendTag
                     insideTag = 0
                     i += sizeEnd
                 else:
@@ -735,4 +738,4 @@ def RemoveTag(texto):
     return textoSaida
 
 def remover_acentos(string):
-     return unicodedata.normalize('NFKD', string).encode('ASCII', 'ignore').decode()
\ No newline at end of file
+     return unicodedata.normalize('NFKD', string).encode('ASCII', 'ignore').decode()