From e1588c797d786de104e4ed93ed216eb4141f5f7c Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Mon, 19 Dec 2022 15:35:42 -0600 Subject: [PATCH] second branch and commit --- Clientes/views.py | 54 ++++++++------------ Templates/Clientes/timbres_cliente.html | 68 +++++++++++-------------- 2 files changed, 52 insertions(+), 70 deletions(-) diff --git a/Clientes/views.py b/Clientes/views.py index 82a9261..6970a91 100644 --- a/Clientes/views.py +++ b/Clientes/views.py @@ -203,8 +203,6 @@ def pageFunc(page,qs,per_page): @login_required @is_staff_access() def timbres_cliente(request, RFC): - - if request.user.is_staff: lista = Timbres.objects.filter(rfcc=RFC) else: @@ -213,42 +211,29 @@ def timbres_cliente(request, RFC): mes = request.GET.get('mes', None) today= datetime.date.today() year =today.year - if mes is None or mes =='None': - mes='00' #Todos - - PAC= request.GET.get('PAC',None) - # if PAC !="00" or PAC !="None": - # lista = lista.filter(rfcp=str(PAC)) - # else: - # lista = Timbres.objects.filter(rfcc=str(RFC)) - - #print(f'{PAC} filter pro pac',lista.count(), lista) - if PAC is not None and PAC !='00': - lista = lista.filter(rfcp=PAC) - - - - - 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) + tipo = request.GET.get('tipo',None) + PAC= request.GET.get('PAC',None) + + if PAC is not None and PAC !='00': + lista = lista.filter(rfcp=PAC) + + - - filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""]} - + filters.pop('page', '') if 'PAC' not in filters: filters['PAC']='00' if 'mes' not in filters: filters['mes']='00' - + if tipo and search is not None: 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("/")] @@ -267,6 +252,9 @@ def timbres_cliente(request, RFC): #print('start',start, 'end',end) lista = lista.filter(created_at__range=[start, end]) + if mes is None or mes =='None' or mes=='': + mes='00' #Todos + if mes != '00': dat = datetime.datetime(int(year), int(mes),1) if dat.month in(1,3,5,7,8,10,12): @@ -279,7 +267,7 @@ def timbres_cliente(request, RFC): lista = lista.filter(created_at__range=[dat,findate]) conteo = lista.count() - print('conteo',conteo) + lista =pageFunc(page,lista,50) context ={ @@ -303,7 +291,7 @@ def export_Excel(request): month = today.month year = today.year - if mes is None or mes =='None': + if mes is None or mes =='None' or mes=='': mes = month dat =datetime.datetime(int(year), int(mes),1) @@ -350,18 +338,21 @@ def export_Excel(request): wb.save( response) return response - @http_basic_auth() def Retrive_Cliente_Email(request): if request.method == 'GET': clientes = list(Clientes.objects.values('email').filter(RFC=request.GET.get('RFC',None))) return JsonResponse({'data':clientes}) -def PACS_Retrive_RFCS(request): - status = 302 +@login_required +@is_staff_access() +def PACS_Retrive_RFCS(request): timbres = {} if request.method == 'GET': + status = 200 timbres =list(Timbres.objects.values('rfcp').filter(rfcp__isnull=False)) + else: + status=403 return JsonResponse({'PACS':timbres},status=status) #-----------------------------------API VIEWS @@ -379,8 +370,7 @@ class check_RFC(APIView): class add_timbre2(APIView): permission_classes = (IsAuthenticated,) - def get(self,request): - + def get(self,request): uuid= request.GET.get('uuid', None) rfcc= request.GET.get('rfcc', None) fecha=request.GET.get('fecha', None) diff --git a/Templates/Clientes/timbres_cliente.html b/Templates/Clientes/timbres_cliente.html index 3823952..2d566b0 100644 --- a/Templates/Clientes/timbres_cliente.html +++ b/Templates/Clientes/timbres_cliente.html @@ -1,34 +1,30 @@ - {% extends 'base.html' %} - - {% block content %}

Timbres {{RFC}}

Timbres totales: {{conteo}}

- -{% if filters.datepicker%} - De fecha: "{{filters.datepicker}}" -{% endif %} -{% if filters.datepickerFin %} - A fecha: "{{filters.datepickerFin}}" -{% endif %} - + + {% if filters.datepicker%} + De fecha: "{{filters.datepicker}}" + {% endif %} + + {% if filters.datepickerFin %} + A fecha: "{{filters.datepickerFin}}" + {% endif %} +

- - + - + {% endfor %} @@ -92,26 +88,26 @@ return res.json() }) .then(data=>{ - let arr = data['PACS'] - let pacs = [...new Set(arr.map((arr)=> arr.rfcp) )] - - pacs.forEach((val,index)=>{ - let option = document.createElement('option') - option.value=val - option.text=val - table_select_PAC.add(option) - PAC.filter(val=>val.includes('PAC')) - .forEach((val,index)=>{ - table_select_PAC.value = val.split('=')[1] - }) + + let pacs = [...new Set( data['PACS'].map((arr)=> arr.rfcp) )] + pacs.forEach((val,index)=>{ + let option = document.createElement('option') + option.value=val + option.text=val + table_select_PAC.add(option) + PAC.filter(val=>val.includes('PAC')) + .forEach((val,index)=>{ + table_select_PAC.value = val.split('=')[1] }) + }) }) } +
UUID UUID PAC @@ -65,7 +61,7 @@ {{obj.rfcp}} {{obj.tipo}} {{obj.serie}}/{{obj.folio}}{{obj.created_at|date:"d M Y"}}{{obj.created_at|date:"d M Y"}}