Filter year index view

Clientes/models.py

@@ -40,13 +40,13 @@ class Clientes(models.Model):
     fecha_baja = models.DateField(blank=True,null=True)
     email = models.EmailField(max_length=254, blank=True)
     conteo_mes = models.IntegerField(blank=True,null=True,default=0)
-    def timbres_X_MES(self, mes=None, year=None):
+    def timbres_X_MES(self, mes=None, year=None, PAC=None):
         today = datetime.date.today()
         if year is None:
             year  = today.year        
         if mes==None:
             mes = today.month
-
+        
         dat = datetime.datetime(int(year),int(mes),1)
         if dat.month in (1,3,5,7,8,10,12):#31    
             findate = dat  + datetime.timedelta(days=30)
@@ -56,8 +56,11 @@ class Clientes(models.Model):
 
         else:#28 or 29
             findate = dat  + datetime.timedelta(days=28)
-        findate += datetime.timedelta(days=1)        
-        cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate]).count()
+        findate += datetime.timedelta(days=1)
+        if PAC:
+            cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate], rfcp=PAC).count()
+        else:
+            cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate]).count()
         self.conteo_mes =cou
         self.save()
         

Clientes/urls.py

@@ -32,6 +32,4 @@ urlpatterns = [
     path('check_host/',check_host.as_view(),name='check_host'),
     path('emails_cliente/',Retrive_Cliente_Email, name='Retrive_Cliente_Email'),
     path('pacs/list/',PACS_Retrive_RFCS,name='PACS_Retrive_RFCS'),
-    
-
 ]

Clientes/views.py

@@ -162,9 +162,10 @@ def send_timbres_Email(request):
 def index(request): 
     #read_env_file()   
     clientes_list = Clientes.objects.all()
+    PAC = request.GET.get('PAC',None)
     mes = request.GET.get('mes', None)
     today = datetime.date.today()
-
+    
     year = request.GET.get('year',None)
     if year is None or year =='None':
         year= today.year
@@ -173,28 +174,29 @@ def index(request):
     page = request.GET.get('page', 1)
     search = request.GET.get('search',None)
     rfcc = request.GET.get('rfcc', None)
-    filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""]}
+    filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""] or value!=None}
     filters.pop('page', '')
     filters.pop('datepicker','')
     filters.pop('datepickerFin','')
     filters.pop('mes','')
     filters.pop('year','')
-    
+    if PAC=='00':
+        filters.pop('PAC')
+        PAC=None
+
     if rfcc and search:
         clientes_list = Clientes.objects.filter(Q(RFC__icontains=search))
-    
-    # for i,ii in enumerate(clientes_list):    
-    #     ii.timbres_X_MES(mes=mes)
+
     met = iter(clientes_list)
     while met:
         try:
             c = next(met)
-            c.timbres_X_MES(mes=mes,year=year)            
+            c.timbres_X_MES(mes=mes,year=year, PAC=PAC)            
         except StopIteration:
             break
 
     clientes_list =pageFunc(page,clientes_list,20)
-    
+
     context = {
         'lista':clientes_list,
         'mes':mes,