From 83ece0be43835f4c9e38f4f1d3900374c2649eaf Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Fri, 12 Jan 2024 11:22:17 -0600 Subject: [PATCH] correciones QueryParams index --- Clientes/views.py | 19 +++++++++++++++---- IMMEX/views.py | 3 --- Templates/paginator.html | 6 +++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Clientes/views.py b/Clientes/views.py index fe2c71c..37eb4f9 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -13,7 +13,7 @@ from django.core.files.storage import FileSystemStorage from django.core.mail import send_mail from django.shortcuts import render,redirect from django.contrib import messages -from django.http import HttpResponse,JsonResponse +from django.http import HttpResponse,JsonResponse,QueryDict from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.db.models import Q @@ -197,11 +197,21 @@ def index(request): while met: try: c = next(met) - c.timbres_X_MES(mes=mes,year=year, PAC=PAC) + if PAC is not None: + c.timbres_X_MES(mes=mes,year=year, PAC=PAC) + else: + c.timbres_X_MES(mes=mes,year=year) except StopIteration: break - clientes_list =pageFunc(page,clientes_list,20) + clientes_list =pageFunc(page,clientes_list,50) + current_query_dict = request.GET.copy() + current_query_dict.pop('page', None) + + current_query_params = current_query_dict.urlencode() + + + context = { 'lista':clientes_list, @@ -209,6 +219,7 @@ def index(request): 'year':year, 'filters':filters, 'emailForm':EmailForm(), + 'current_query_params':current_query_params } return render(request,'Clientes/index.html',context) @@ -218,7 +229,7 @@ def pageFunc(page,qs,per_page): try: qs = paginator.page(page) except PageNotAnInteger: - qs = Paginator.page(1) + qs = paginator.page(1) except EmptyPage: qs = paginator.page(paginator.num_pages) return qs diff --git a/IMMEX/views.py b/IMMEX/views.py index 476c540..759248b 100644 --- a/IMMEX/views.py +++ b/IMMEX/views.py @@ -702,6 +702,3 @@ class Permisos_A24_ModelViewSet(viewsets.ModelViewSet): headers = self.get_success_headers(serializer.data) return Response(serializer.data,status=status.HTTP_201_CREATED, headers=headers) - - # def update(self,request,*args,**kwargs): - # pk= \ No newline at end of file diff --git a/Templates/paginator.html b/Templates/paginator.html index 8bb1347..bfbcabd 100644 --- a/Templates/paginator.html +++ b/Templates/paginator.html @@ -47,7 +47,7 @@