global filter by client and month

Clientes/views.py

@@ -174,15 +174,34 @@ class ClientesUpdateView(UserPassesTestMixin,LoginRequiredMixin,UpdateView):
 def export_Excel(request):
     
     RFC = request.GET.get('RFC', None)
-    
+    mes = request.GET.get('mes',None)
+
     today = datetime.date.today()
     month = today.month
-    year  = today.year        
-    if RFC is not None:
-        objeto_a_trabajar = Timbres.objects.filter(rfcc=RFC, created_at__year=str(year),created_at__month=str(month))
-    else:
+    year  = today.year    
+    
+    if mes is None or mes =='None':
+        mes = month
+
+    dat =datetime.datetime(int(year), int(mes),1)
+    
+    if dat.month in(1,3,5,7,8,10,12):
+        findate = dat +datetime.timedelta(days=30)
+    elif dat.month in (4,6,9,11):
+        findate = dat+datetime.timedelta(days=29)
+    else:
+        findate = dat+datetime.timedelta(days=28)
+    findate +=datetime.timedelta(days=1)
+    print(f'dat{dat}   findate:{findate}')
+    if mes is not None and RFC is not None:
+        objeto_a_trabajar = Timbres.objects.filter(rfcc=RFC, created_at__range=[dat,findate])
+        #objeto_a_trabajar = Timbres.objects.filter(rfcc=RFC, created_at__year=str(year),created_at__month=str(month))
+    else:
+        objeto_a_trabajar = Clientes.objects.all()    
+        for i,ii in enumerate(objeto_a_trabajar):
+            ii.timbres_X_MES(mes=mes )
+        
 
-        objeto_a_trabajar = Clientes.objects.all()
 
     wb = Workbook()
     ws = wb.active
@@ -203,10 +222,10 @@ def export_Excel(request):
         for q,qq in enumerate(objeto_a_trabajar,start=2):
             ws['A' + str(q)] = qq.RFC        
             ws['B'+ str(q)] = qq.Nombre
-            ws['C'+ str(q)] = qq.timbres_mes_count
+            ws['C'+ str(q)] = qq.conteo_mes
 
-
-    nombre_archivo = f"Timbres_{RFC if RFC is not None else 'Clientes_MES'}_{str(year)}_{str(month)}.xlsx"
+    
+    nombre_archivo = f"Timbres_{RFC if RFC is not None else 'Clientes_MES'}_{str(mes)}_AÑO_{str(year)}.xlsx"
     response = HttpResponse(content_type="application/ms-excel")
     contenido = "attachment; filename = {0}".format(nombre_archivo)
     response["Content-Disposition"] = contenido