From fece4fa45525ab8ef878e7a98713b09561158bd9 Mon Sep 17 00:00:00 2001 From: Francisco J Date: Thu, 1 Dec 2022 21:13:50 +0000 Subject: [PATCH] Resolve dates issue in timbres --- Admin/settings.py | 4 ++-- Clientes/admin.py | 4 +++- Clientes/views.py | 37 ++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Admin/settings.py b/Admin/settings.py index 49a5093..1c67aa5 100644 --- a/Admin/settings.py +++ b/Admin/settings.py @@ -18,7 +18,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = 'django-insecure-5*mm&uf5zq@t6nrs_5z8-_qtyapm^3&yz^wqqkc_a!v(!ulj-^' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False ALLOWED_HOSTS = ['*'] @@ -32,7 +32,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - + 'allauth', 'allauth.account', 'allauth.socialaccount', diff --git a/Clientes/admin.py b/Clientes/admin.py index 3b2e4d6..2235778 100644 --- a/Clientes/admin.py +++ b/Clientes/admin.py @@ -1,7 +1,9 @@ from django.contrib import admin -from .models import Timbres, saldoModel, Clientes +from .models import Timbres, saldoModel, Clientes,ErroresTimbres admin.site.register(Timbres) admin.site.register(saldoModel) admin.site.register(Clientes) +admin.site.register(ErroresTimbres) + diff --git a/Clientes/views.py b/Clientes/views.py index 630584c..86f5906 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -13,10 +13,10 @@ from django.contrib.auth.mixins import UserPassesTestMixin @login_required def index(request): - + clientes_list = Clientes.objects.all() - - + + page = request.GET.get('page', 1) search = request.GET.get('search',None) @@ -34,7 +34,7 @@ def index(request): clientes = paginator.page(paginator.num_pages) context = { 'clientes':clientes, - + } return render(request,'Clientes/index.html',context) @@ -43,7 +43,7 @@ def add_timbre(request): uuid= request.GET.get('uuid', None) rfcc= request.GET.get('rfcc', None) fecha=request.GET.get('fecha', None) - folio=request.GET.get('folio', None) + folio=request.GET.get('folio', None) serie=request.GET.get('serie', None) tipo=request.GET.get('tipo', None) rfcp=request.GET.get('rfcp', None) @@ -55,7 +55,7 @@ def add_timbre(request): 'serie':serie, 'tipo':tipo, 'rfcp':rfcp - } + } try: obj = Timbres.objects.create(**obj) return HttpResponse('ok') @@ -83,29 +83,32 @@ def pageFunc(page,qs,per_page): @login_required def timbres_cliente(request, RFC): lista = Timbres.objects.filter(rfcc=RFC) - + search = request.GET.get('search',None) page = request.GET.get('page', 1) datepicker = request.GET.get('datepicker', None) datepickerFin = request.GET.get('datepickerFin', None) tipo = request.GET.get('tipo',None) - - + + filters = {key:value for (key,value) in dict(request.GET).items() if value !=None} - print('filters',filters) + if tipo: lista = lista.filter(Q(tipo__icontains=search)) + if datepicker and datepickerFin: inicio = [int(i) for i in datepicker.split("/")] fin = [int(i) for i in datepickerFin.split("/")] inicio.sort(reverse=True) fin.sort(reverse=True) - start = datetime.date(inicio[0],inicio[2],inicio[1]) - end = datetime.date(fin[0],fin[2],fin[1]) - end += datetime.timedelta(days=1) - print(start, end) + start = datetime.datetime(inicio[0],inicio[2],inicio[1]) + start += datetime.timedelta(days=0) + end = datetime.datetime(fin[0],fin[2],fin[1]) + end += datetime.timedelta(days=1) + print('start',start, 'end',end) + lista = lista.filter(created_at__range=[start, end]) - + conteo = lista.count() pageFunc(page,lista,1) @@ -124,8 +127,8 @@ def saldo_funct(request): Saldo.save() except: Saldo = saldoModel.objects.create(saldo=int(timbres)) - - return JsonResponse({'data':Saldo.saldo}) + + return JsonResponse({'data':Saldo.saldo}) class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView):