filter in clientes timbres by year

Clientes/models.py

@@ -46,27 +46,26 @@ class Clientes(models.Model):
             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)
-            
+
         elif dat.month in (4,6,9,11):#30
             findate = dat  + datetime.timedelta(days=29)
-            
+
         else:#28 or 29
             findate = dat  + datetime.timedelta(days=28)
-        findate += datetime.timedelta(days=1)
-        #print(f'dat {(dat)} fdate={findate}')    
+        findate += datetime.timedelta(days=1)        
         cou = Timbres.objects.filter(rfcc=self.RFC, created_at__range=[dat,findate]).count()
         self.conteo_mes =cou
         self.save()
-        #return cou
+        
     @property
     def timbres_mes_count(self):
         today = datetime.date.today()
         month = today.month
-        year  = today.year        
+        year  = today.year
         return Timbres.objects.filter(rfcc=self.RFC, created_at__year=str(year),created_at__month=str(month)).count()
     class Meta:
         ordering = ('-Activo','-conteo_mes','RFC') 
@@ -81,5 +80,4 @@ class Maquinas_Conectadas(models.Model):
     public_ip= models.CharField(max_length=55)
     RFC      = models.CharField(max_length=13)
     class Meta:
-        abstract =True
-
+        abstract =True

Clientes/saldo_context_proc.py

@@ -1,5 +1,4 @@
 import requests
-from asgiref.sync import sync_to_async
 from .models import saldoModel
 import datetime
 

Clientes/views.py

@@ -39,20 +39,20 @@ def read_env_file():
         #env_file = os.listdir(settings.BASE_DIR)
         storage = FileSystemStorage(location=settings.BASE_DIR)
         env_file= os.path.join(settings.BASE_DIR,'.env')
-        print('EEEEE: ', env_file)
+        
 
         lista =['asds', 'asdasd','sss','com' ,'pol.com']
         if storage.exists(env_file):
             with open(env_file, 'r') as file:
                 data = file.read()
                 data =re.findall('"([^"]*)"',data)
-                print('data',data)
+                
             
                 for x in lista:
                     data.append(x)
                 res= ' '.join(data)
                 final = '"'+res+'"'
-                print('final',final)
+                
             with open(env_file, 'w') as newFile:
                 newFile.write("export hosts="+final)        
     except:
@@ -98,7 +98,7 @@ def send_timbres_Email(request):
     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])
     else:
@@ -179,7 +179,7 @@ def index(request):
     filters.pop('datepickerFin','')
     filters.pop('mes','')
     filters.pop('year','')
-    print('filters------',filters)
+    
     if rfcc and search:
         clientes_list = Clientes.objects.filter(Q(RFC__icontains=search))
     
@@ -224,9 +224,14 @@ def timbres_cliente(request, RFC):
     else:
         lista = Timbres.objects.filter(rfcc=RFC,modo='Normal')
 
-    mes = request.GET.get('mes', None)    
-    today= datetime.date.today()
-    year =today.year
+    mes = request.GET.get('mes', None) 
+    year = request.GET.get('year',None)
+    
+    if year is None or year=='':
+        
+        today= datetime.date.today()    
+        year =today.year
+
     search = request.GET.get('search',None)
     page = request.GET.get('page', 1)
     datepicker    = request.GET.get('datepicker', None)
@@ -253,7 +258,7 @@ def timbres_cliente(request, RFC):
         # fin    = [int(i) for i in datepickerFin.split("/")]
         inicio = [int(i) for i in datepicker.split("-")]
         fin    = [int(i) for i in datepickerFin.split("-")]
-        #print('inicio',inicio,' fin',fin)        
+              
         #start   = datetime.datetime(inicio[2],inicio[0],inicio[1])
         start   = datetime.datetime(inicio[0],inicio[1],inicio[2])
         
@@ -262,22 +267,25 @@ def timbres_cliente(request, RFC):
         end     = datetime.datetime(fin[0],fin[1],fin[2])
         
         end     += datetime.timedelta(days=1)        
-        #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):
-            findate = dat +datetime.timedelta(days=30)
+            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)
         lista = lista.filter(created_at__range=[dat,findate])
+    else:        
+        lista = lista.filter(created_at__year=int(year))
 
     conteo = lista.count()
     
@@ -316,7 +324,7 @@ def export_Excel(request):
     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])        
     else:
@@ -446,7 +454,7 @@ class check_host(APIView):
     permission_classes = (IsAuthenticated,)    
     def post(self,request, format=None):
         data = request.data
-        print(data)
+        
         return Response(data)
 
 #---------------------------CLASS BASED VIEWS