Correção paginação no PDF

Co-authored-by: Vinícius Cantuária <cantuariavc@gmail.com>
7 years ago · 1b63a98c9c
3 changed files with 11 additions and 12 deletions
--- a/sapl/protocoloadm/forms.py
+++ b/sapl/protocoloadm/forms.py
@ -217,7 +217,7 @@ class DocumentoAdministrativoFilterSet(django_filters.FilterSet):
               HTML('''
                    <div class="form-check">
                        <input name="relatorio" type="checkbox" class="form-check-input" id="relatorio">
-                        <label class="form-check-label" for="relatorio">Gerar relatorio PDF</label>
+                        <label class="form-check-label" for="relatorio">Gerar relatório PDF</label>
                    </div>
                ''' )
           ],
--- a/sapl/protocoloadm/views.py
+++ b/sapl/protocoloadm/views.py
@ -902,9 +902,9 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin,
        context = super(PesquisarDocumentoAdministrativoView,
                        self).get_context_data(**kwargs)

+        if self.paginate_by:
            paginator = context['paginator']
            page_obj = context['page_obj']
-
            context['page_range'] = make_pagination(
                page_obj.number, paginator.num_pages)
                    
@ -934,8 +934,7 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin,
            length = self.object_list.count()
                
        is_relatorio = url!='' and request.GET.get('relatorio',None)
-        max_elementos_pdf = 10000
-        self.paginate_by = max_elementos_pdf if is_relatorio else 10 
+        self.paginate_by = None if is_relatorio else self.paginate_by 
        context = self.get_context_data(filter=self.filterset,
                                        filter_url=url,
                                        numero_res=length
--- a/sapl/templates/relatorios/relatorio_doc_administrativos.html
+++ b/sapl/templates/relatorios/relatorio_doc_administrativos.html
@ -44,9 +44,9 @@

 <body>
  <h2>Documentos Administrativos</h2>
-            {% if page_obj|length %}
+            {% if documentoadministrativo_list|length %}
              <h3>Número de documentos: {{numero_res}}</h3>
-              {% for d in page_obj %}
+              {% for d in documentoadministrativo_list %}
                <div style="border-top: 1px solid black;margin-bottom:0.3cm">
                {% if request.user.is_anonymous and not d.restrito or not request.user.is_anonymous%}
                    <strong><a href="{% url 'sapl.protocoloadm:documentoadministrativo_detail' d.id %}">{{d.tipo.sigla}} {{d.numero}}/{{d.ano}} - {{d.tipo}}</strong></a></br>