iter in conteo_mes_clientes

This commit is contained in:
fjrodriguez
2022-12-21 13:04:29 -06:00
parent effd74c947
commit 53230f122f
4 changed files with 26 additions and 9 deletions

View File

@@ -4,10 +4,12 @@ from .models import Timbres, saldoModel, Clientes,ErroresTimbres
class TimbresAdmin(admin.ModelAdmin): class TimbresAdmin(admin.ModelAdmin):
list_display=['uuid','rfcc','rfcp','fecha','folio','serie','tipo','modo','created_at'] list_display=['uuid','rfcc','rfcp','fecha','folio','serie','tipo','modo','created_at']
list_filter=['modo','tipo']
class ClientesAdmin(admin.ModelAdmin): class ClientesAdmin(admin.ModelAdmin):
list_display= ['RFC','Nombre','Activo','fecha_baja'] list_display= ['RFC','Nombre','Activo','fecha_baja']
list_filter =['RFC','Activo']
admin.site.register(Timbres,TimbresAdmin) admin.site.register(Timbres,TimbresAdmin)
admin.site.register(saldoModel) admin.site.register(saldoModel)

View File

@@ -40,7 +40,7 @@ class Clientes(models.Model):
fecha_baja = models.DateField(blank=True,null=True) fecha_baja = models.DateField(blank=True,null=True)
email = models.EmailField(max_length=254, blank=True) email = models.EmailField(max_length=254, blank=True)
conteo_mes = models.IntegerField(blank=True,null=True,default=0) conteo_mes = models.IntegerField(blank=True,null=True,default=0)
def timbres_X_MES(self, mes): def timbres_X_MES(self, mes=None):
today = datetime.date.today() today = datetime.date.today()
year = today.year year = today.year
if mes==None: if mes==None:
@@ -48,10 +48,10 @@ class Clientes(models.Model):
dat = datetime.datetime(int(year),int(mes),1) dat = datetime.datetime(int(year),int(mes),1)
if dat.month in (1,3,5,7,8,10,12):#31 if dat.month in (1,3,5,7,8,10,12):#31
findate = dat + datetime.timedelta(days=30) findate = dat + datetime.timedelta(days=30)
#findate += datetime.timedelta(days=0)
elif dat.month in (4,6,9,11):#30 elif dat.month in (4,6,9,11):#30
findate = dat + datetime.timedelta(days=29) findate = dat + datetime.timedelta(days=29)
#findate += datetime.timedelta(days=0)
else:#28 or 29 else:#28 or 29
findate = dat + datetime.timedelta(days=28) findate = dat + datetime.timedelta(days=28)
findate += datetime.timedelta(days=1) findate += datetime.timedelta(days=1)

View File

@@ -174,11 +174,20 @@ def index(request):
filters.pop('datepicker','') filters.pop('datepicker','')
filters.pop('datepickerFin','') filters.pop('datepickerFin','')
filters.pop('mes','') filters.pop('mes','')
print('filters------',filters) #print('filters------',filters)
if rfcc: if rfcc:
clientes_list = Clientes.objects.filter(Q(RFC__icontains=search)) clientes_list = Clientes.objects.filter(Q(RFC__icontains=search))
for i,ii in enumerate(clientes_list):
ii.timbres_X_MES(mes=mes) # 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)
except StopIteration:
break
clientes_list =pageFunc(page,clientes_list,20) clientes_list =pageFunc(page,clientes_list,20)
context = { context = {
@@ -346,12 +355,16 @@ def Retrive_Cliente_Email(request):
return JsonResponse({'data':clientes}) return JsonResponse({'data':clientes})
@login_required @login_required
@is_staff_access() #@is_staff_access()
def PACS_Retrive_RFCS(request): def PACS_Retrive_RFCS(request):
timbres = {} timbres = {}
if request.method == 'GET': if request.method == 'GET':
RFC= request.GET.get('RFC','')
status = 200 status = 200
timbres =list(Timbres.objects.values('rfcp').filter(rfcp__isnull=False)) if RFC !='':
timbres =list(Timbres.objects.values('rfcp').filter(rfcc__in=[RFC]))
else:
timbres =list(Timbres.objects.values('rfcp').filter(rfcp__isnull=False))
else: else:
status=403 status=403
return JsonResponse({'PACS':timbres},status=status) return JsonResponse({'PACS':timbres},status=status)

View File

@@ -75,7 +75,9 @@
{% block scripts %} {% block scripts %}
<script> <script>
function get_pacs(){ function get_pacs(){
url = "{% url 'PACS_Retrive_RFCS' %}" let rfc = '{{request.path}}'
rfc= Object.values(rfc.split('/'))
url = `{% url 'PACS_Retrive_RFCS' %}?RFC=${rfc[2]}`
fetch(url, { fetch(url, {
method: 'GET', method: 'GET',
headers:{ headers:{