PAC filter

Clientes/views.py

@@ -149,21 +149,10 @@ def index(request):
     print('filters------',filters)
     if rfcc:
         clientes_list = Clientes.objects.filter(Q(RFC__icontains=search))
-        
     for i,ii in enumerate(clientes_list):
         ii.timbres_X_MES(mes=mes)    
-
-    
     clientes_list =pageFunc(page,clientes_list,20)
 
-    # paginator = Paginator(clientes_list, 5)
-
-    # try:
-    #     lista = paginator.page(page)
-    # except PageNotAnInteger:
-    #     lista = paginator.page(1)
-    # except EmptyPage:
-    #     lista = paginator.page(paginator.num_pages)
     filters.pop('mes','')
     context = {
         'lista':clientes_list,
@@ -193,6 +182,12 @@ def timbres_cliente(request, RFC):
         lista = Timbres.objects.filter(rfcc=RFC)
     else:
         lista = Timbres.objects.filter(rfcc=RFC,modo='Normal')
+    
+    PAC= request.GET.get('PAC',None)
+    if PAC=='01':
+        lista = lista.filter(rfcp='EME000602QR9')
+    if PAC=='02':
+        lista = lista.exclude(rfcp='EME000602QR9')
     search = request.GET.get('search',None)
     page = request.GET.get('page', 1)
     datepicker    = request.GET.get('datepicker', None)
@@ -202,6 +197,8 @@ def timbres_cliente(request, RFC):
 
     filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""]}
     filters.pop('page', '')
+    filters.pop('PAC', '')
+    
     
     if tipo:
         lista = lista.filter(Q(tipo__icontains=search))
@@ -228,6 +225,7 @@ def timbres_cliente(request, RFC):
         'lista':lista,
         'conteo':conteo,
         'RFC':RFC,
+        'PAC':PAC,
         'filters':filters
     }
     return render(request, 'Clientes/timbres_cliente.html', context)

Templates/Clientes/index.html

@@ -24,10 +24,8 @@ Timbres disponibles Comercio Digital: {{saldo}}
             </div>
 
             <select id="table_select" class="form-control form-control-sm">
-              <option value="01">Enero
+              <option value="01">Enero</option>
-              </option>
+              <option value="02">Febrero</option>
-              <option value="02">Febrero
-              </option>
               <option value="03">Marzo
               </option>
               <option value="04">Abril
@@ -83,6 +81,7 @@ Timbres disponibles Comercio Digital: {{saldo}}
                         Acciones
                       </button>
                       <div class="dropdown-menu">
+                        
                         <a class="btn btn-outline-info w-100" href="{% url 'timbres_cliente' obj.RFC %}" >
                           <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye" viewBox="0 0 16 16">
                             <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>

Templates/Clientes/timbres_cliente.html

@@ -22,7 +22,14 @@
       <tr>
         <th scope="col">UUID</th>
         
-        <th scope="col">PAC</th>
+        <th scope="col">
+          PAC
+          <select id="table_select_PAC" class="form-control form-control-sm">
+            <option value="00">Todos</option>
+            <option value="01">EDICOM</option>
+            <option value="02">Comercio Dig.</option>
+          </select>
+        </th>
         <th scope="col">
           <input id="table_tipo" name="tipo" value="True" type="checkbox" class="form-check-input" >
           Tipo CFDI
@@ -47,42 +54,59 @@
     </tbody>
 </table>
 
+<div id='id_filters' style="display: None;">{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}</div>
 
 {% endblock content %}
     
 
 {% block scripts %}
     <script>
-        table_tipo.addEventListener('click', (event)=>{
+      window.addEventListener("load", (event)=>{
-            document.getElementById('tipo').checked = table_tipo.checked? true:false;
+        let PAC = '{{PAC}}'
-            if(table_fecha.checked){
+        if(PAC !="None"){
-                table_fecha.click()
+          table_select_PAC.value=PAC
-            }
+        }
-        })
+      })
+      let filters = document.getElementById('id_filters').textContent
 
-        table_fecha.addEventListener('click', (event)=>{
+      table_select_PAC.addEventListener('change',(event)=>{
+        let anc = document.getElementById('home_id')
+        anc.href=''
+        let url = `?PAC=${event.target.value}${filters}`
+        anc.href=url
+        anc.click()
+      })
+        
+      table_tipo.addEventListener('click', (event)=>{
+          document.getElementById('tipo').checked = table_tipo.checked? true:false;
+          if(table_fecha.checked){
+              table_fecha.click()
+          }
+      })
+
+      table_fecha.addEventListener('click', (event)=>{
           
 
-            if(dates.hasAttribute("style")){
+          if(dates.hasAttribute("style")){
-                dates.removeAttribute('style')
+              dates.removeAttribute('style')
-                datepicker.value=''
+              datepicker.value=''
-                datepicker.setAttribute("required",'')
+              datepicker.setAttribute("required",'')
-                datepickerFin.value=''
+              datepickerFin.value=''
 
-                datepickerFin.setAttribute('required','')
+              datepickerFin.setAttribute('required','')
-                search.setAttribute("style","display:none;")
+              search.setAttribute("style","display:none;")
-                search.value=''
+              search.value=''
               
-            }else{
+          }else{
-                dates.setAttribute("style","display:none;")
+              dates.setAttribute("style","display:none;")
-                search.removeAttribute('style')
+              search.removeAttribute('style')
-                datepicker.removeAttribute('required')
+              datepicker.removeAttribute('required')
-                datepickerFin.removeAttribute('required')
+              datepickerFin.removeAttribute('required')
-            }
+          }
-            if(table_tipo.checked && table_fecha.checked){
+          if(table_tipo.checked && table_fecha.checked){
-                table_tipo.checked=false
+              table_tipo.checked=false
-            }
+          }
-        })
+      })
     </script>
 {% endblock scripts %}
     

Templates/partials/search_form.html

@@ -3,7 +3,7 @@
   Fecha: <strong>{{fecha|date:"d F Y"}}</strong>
 </span>
 <form  action="{{request.path}}" method="get" class="form-inline my-2 my-lg-0">
-    <input style="display:none" id="mes_id" class="form-control mr-sm-2" name="mes" type="input" placeholder="mes" aria-label="mes">
+    <input style="display:none" id="mes_id" class="form-control mr-sm-2" name="mes" type="input" aria-label="mes">
     <input  id="search" class="form-control mr-sm-2" name="search" type="search" placeholder="Search" aria-label="Search">
     
     <div class="form-group form-check">
@@ -15,8 +15,8 @@
     </div>
      
     <div id="dates" style="display:none;" class="group-form mr-2" >
-        <input class="form-control sm-2" name = "datepicker" id="datepicker" placeholder="Initial Date"  />
+        <input class="form-control sm-2" name ="datepicker" id="datepicker" placeholder="Initial Date"  />
-        <input class="form-control sm-2" name = "datepickerFin" id="datepickerFin" placeholder="End Date"  />
+        <input class="form-control sm-2" name ="datepickerFin" id="datepickerFin" placeholder="End Date"  />
         <script>
           $('#datepicker').datepicker({
             uiLibrary: 'bootstrap4'