removendo partes desnecessarias do codigo como o None do get e os css dos relatorios

6 years ago · 53829ba252
19 changed files with 2 additions and 629 deletions
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@ -317,7 +317,7 @@ class RelatorioMixin:
    def get(self, request, *args, **kwargs):
        super(RelatorioMixin, self).get(request)

-        is_relatorio = request.GET.get('relatorio', None)
+        is_relatorio = request.GET.get('relatorio')
        context = self.get_context_data(filter=self.filterset)

        if is_relatorio:
@ -1066,7 +1066,7 @@ class EstatisticasAcessoNormas(TemplateView):
        
        context['normas_mes'] = normas_mes

-        is_relatorio = request.GET.get('relatorio', None)
+        is_relatorio = request.GET.get('relatorio')

        context['show_results'] = show_results_filter_set(
            self.request.GET.copy())
--- a/sapl/templates/relatorios/relatorio_ata.html
+++ b/sapl/templates/relatorios/relatorio_ata.html
@ -1,38 +1,6 @@
 {% load common_tags %}
 {% load static %}
 <head>
-    <style>
-        @page{
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-        
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-              
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
     <link rel="stylesheet" href="{% static 'sapl/css/relatorio.css'%}">
 </head>	

--- a/sapl/templates/relatorios/relatorio_atas.html
+++ b/sapl/templates/relatorios/relatorio_atas.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_audiencia.html
+++ b/sapl/templates/relatorios/relatorio_audiencia.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_doc_administrativos.html
+++ b/sapl/templates/relatorios/relatorio_doc_administrativos.html
@ -3,41 +3,6 @@
 {% load crispy_forms_tags staticfiles %}

 <head>
-    <style>
-        @page{
-            margin-top: 5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-        
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-              
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>	

--- a/sapl/templates/relatorios/relatorio_documento_acessorio.html
+++ b/sapl/templates/relatorios/relatorio_documento_acessorio.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_estatisticas_acesso_normas.html
+++ b/sapl/templates/relatorios/relatorio_estatisticas_acesso_normas.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_fim_prazo_tramitacao.html
+++ b/sapl/templates/relatorios/relatorio_fim_prazo_tramitacao.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_historico_tramitacao.html
+++ b/sapl/templates/relatorios/relatorio_historico_tramitacao.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_historico_tramitacao_adm.html
+++ b/sapl/templates/relatorios/relatorio_historico_tramitacao_adm.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_materias_em_tramitacao.html
+++ b/sapl/templates/relatorios/relatorio_materias_em_tramitacao.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-        
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-              
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}"> 
 </head>

--- a/sapl/templates/relatorios/relatorio_materias_por_ano_autor.html
+++ b/sapl/templates/relatorios/relatorio_materias_por_ano_autor.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-        
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-              
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}"> 
 </head>	

--- a/sapl/templates/relatorios/relatorio_materias_por_autor.html
+++ b/sapl/templates/relatorios/relatorio_materias_por_autor.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-        
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-              
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}"> 
 </head>	

--- a/sapl/templates/relatorios/relatorio_normas_mes.html
+++ b/sapl/templates/relatorios/relatorio_normas_mes.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_normas_por_autor.html
+++ b/sapl/templates/relatorios/relatorio_normas_por_autor.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_normas_vigencia.html
+++ b/sapl/templates/relatorios/relatorio_normas_vigencia.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_presenca_sessao.html
+++ b/sapl/templates/relatorios/relatorio_presenca_sessao.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_reuniao.html
+++ b/sapl/templates/relatorios/relatorio_reuniao.html
@ -4,41 +4,6 @@


 <head>
-    <style>
-        @page{
-            margin-top: 4.5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-    </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>

--- a/sapl/templates/relatorios/relatorio_sessao_plenaria.html
+++ b/sapl/templates/relatorios/relatorio_sessao_plenaria.html
@ -5,41 +5,6 @@
 <html lang="pt-br">

 <head>
-   <style>
-            @page{
-            margin-top: 5cm;
-            size: A4 portrait;
-
-            @bottom-right {
-                content: "Página" counter(page);
-                height: 3cm;
-                font-size: 8pt;
-            }
-        
-            @bottom-center {
-                border-top: 1px solid black;
-                font-size: 8pt;
-                height: 1cm;
-                content: "{{rodape|safe}}";
-                font-style:italic;
-            }
-            @bottom-left {
-                content: "{{data}}";
-                height: 3cm;
-                font-size: 8pt;
-            }
-              
-            @top-center {
-                content:  string(title);
-            }
-            header {
-                width: 0;
-                height: 0;
-                visibility: hidden;
-                string-set: title content();
-            }
-        }
-   </style>
    <link rel="stylesheet" href="{% static '/sapl/css/relatorio.css'%}">
 </head>