SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Correção paginação no PDF 

Co-authored-by: Vinícius Cantuária <cantuariavc@gmail.com>
pull/2816/head
ulyssesBML 7 years ago
parent
e2b18058b7
commit
1b63a98c9c
3 changed files with 11 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      sapl/protocoloadm/forms.py
  2. 17
      sapl/protocoloadm/views.py
  3. 4
      sapl/templates/relatorios/relatorio_doc_administrativos.html

2
sapl/protocoloadm/forms.py
View File

@ -217,7 +217,7 @@ class DocumentoAdministrativoFilterSet(django_filters.FilterSet):
HTML(''' HTML('''
<div class="form-check"> <div class="form-check">
<input name="relatorio" type="checkbox" class="form-check-input" id="relatorio"> <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> </div>
''' ) ''' )
], ],

17
sapl/protocoloadm/views.py
View File

@ -902,12 +902,12 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin,
context = super(PesquisarDocumentoAdministrativoView, context = super(PesquisarDocumentoAdministrativoView,
self).get_context_data(**kwargs) self).get_context_data(**kwargs)
paginator = context['paginator'] if self.paginate_by:
page_obj = context['page_obj'] paginator = context['paginator']
page_obj = context['page_obj']
context['page_range'] = make_pagination( context['page_range'] = make_pagination(
page_obj.number, paginator.num_pages) page_obj.number, paginator.num_pages)
return context return context
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
@ -934,8 +934,7 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin,
length = self.object_list.count() length = self.object_list.count()
is_relatorio = url!='' and request.GET.get('relatorio',None) is_relatorio = url!='' and request.GET.get('relatorio',None)
max_elementos_pdf = 10000 self.paginate_by = None if is_relatorio else self.paginate_by
self.paginate_by = max_elementos_pdf if is_relatorio else 10
context = self.get_context_data(filter=self.filterset, context = self.get_context_data(filter=self.filterset,
filter_url=url, filter_url=url,
numero_res=length numero_res=length
@ -947,7 +946,7 @@ class PesquisarDocumentoAdministrativoView(DocumentoAdministrativoMixin,
return relatorio_doc_administrativos(request,context) return relatorio_doc_administrativos(request,context)
else: else:
return self.render_to_response(context) return self.render_to_response(context)
class AnexadoCrud(MasterDetailCrud): class AnexadoCrud(MasterDetailCrud):
model = Anexado model = Anexado
parent_field = 'documento_principal' parent_field = 'documento_principal'

4
sapl/templates/relatorios/relatorio_doc_administrativos.html
View File

@ -44,9 +44,9 @@
<body> <body>
<h2>Documentos Administrativos</h2> <h2>Documentos Administrativos</h2>
{% if page_obj|length %} {% if documentoadministrativo_list|length %}
<h3>Número de documentos: {{numero_res}}</h3> <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"> <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%} {% 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> <strong><a href="{% url 'sapl.protocoloadm:documentoadministrativo_detail' d.id %}">{{d.tipo.sigla}} {{d.numero}}/{{d.ano}} - {{d.tipo}}</strong></a></br>

Write Preview
Loading…
Cancel
Save