diff --git a/Clientes/models.py b/Clientes/models.py index 2cdc6ed..df07ecc 100644 --- a/Clientes/models.py +++ b/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() diff --git a/Clientes/urls.py b/Clientes/urls.py index 552324e..3901903 100644 --- a/Clientes/urls.py +++ b/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'), - - ] \ No newline at end of file diff --git a/Clientes/views.py b/Clientes/views.py index 82fc3d5..bbe0565 100644 --- a/Clientes/views.py +++ b/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, diff --git a/Templates/404.html b/Templates/404.html index f4fae37..c333307 100644 --- a/Templates/404.html +++ b/Templates/404.html @@ -1 +1,35 @@ -no hay + + + + + + + + + + + AS Admin Pagina No Encontrada + + +
+ {% include 'partials/messages.html' %} + Forbidden + + + + + Regresar al Inicio + + + + +
+ + + + + + + + + diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html index 85306fa..11dc739 100644 --- a/Templates/Clientes/index.html +++ b/Templates/Clientes/index.html @@ -18,38 +18,56 @@ Timbres disponibles Comercio Digital: {{saldo}} Nombre -
- Total x mes +
+
+ + + Filtrado: Mes:{{mes}}, Año:{{year}}, PAC: + +
- - - +
+
+ + + + + + + +
+
Estado @@ -139,7 +157,7 @@ Timbres disponibles Comercio Digital: {{saldo}}
-
{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}
+ @@ -289,8 +307,47 @@ Timbres disponibles Comercio Digital: {{saldo}} let filters = document.getElementById('id_filters').textContent let mes ='{{mes}}' let year = parseInt('{{year}}') + let anc = document.getElementById('home_id') + let PAC = Object.values(filters.split('&')) + PAC.filter(val=>{ + lbl_pac.innerHTML="Todos" + if(val.length >0){ + lbl_pac.innerHTML= val.split('=')[1]=="" ? "Todos" :val.split('=')[1] + } + }) + + /*-------------------------Carga los pacs*/ + fetch("{% url 'PACS_Retrive_RFCS' %}",{ + method:'GET', + headers:{ + 'Content-Type':'application/json', + 'X-Requested-With':'XMLHttpRequest', + }, + credentials:"same-origin" + }) + .then(res=>{ + return res.json() + }) + .then(data=>{ + 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] + }) + }) + }) + .catch(error=>{ + console.log(error) + }) + /*----------------------fin carga pacs*/ function aclick(event,RFC ,cuantos){ @@ -338,7 +395,7 @@ Timbres disponibles Comercio Digital: {{saldo}} document.getElementById('table_select').addEventListener('change',(event)=>{ spinner_id.setAttribute('style','display:inline;') - let anc = document.getElementById('home_id') + anc.href='' let url = `?mes=${event.target.value}&year=${year}${filters}` @@ -353,7 +410,7 @@ Timbres disponibles Comercio Digital: {{saldo}} table_select_anio.addEventListener('change',(event)=>{ spinner_id.setAttribute('style','display:inline;') - let anc = document.getElementById('home_id') + anc.href='' let url = `?mes=${mes}&year=${event.target.value}${filters}` @@ -364,6 +421,17 @@ Timbres disponibles Comercio Digital: {{saldo}} },1000) }) + table_select_PAC.addEventListener('change',(event)=>{ + spinner_id.setAttribute('style','display:inline;'); + anc.href=''; + let url =`?mes=${mes}&year=${year}&PAC=${event.target.value}` + setTimeout(()=>{ + anc.href=url + anc.click() + },1000) + + }) + enviar_btn.addEventListener('click',(e)=>{ if(id_form.checkValidity()){