From 4604c0894ced98d0da820b042e647a0a98cd253d Mon Sep 17 00:00:00 2001
From: fjrodriguez <fjrodriguez28@adunanasoft.com.mx>
Date: Mon, 5 Dec 2022 09:56:04 -0600
Subject: [PATCH] filter 2 page remove from filter page

---
 Clientes/forms.py                       | 16 ++++++++++++++--
 Clientes/models.py                      |  4 ++--
 Clientes/views.py                       | 11 +++++++----
 Templates/Clientes/edit_cliente.html    |  5 ++---
 Templates/Clientes/index.html           | 14 ++++++++++++--
 Templates/Clientes/timbres_cliente.html |  9 +++++++++
 Templates/base.html                     |  2 ++
 Templates/paginator.html                |  4 +++-
 Templates/partials/messages.html        | 13 +++++++++++++
 9 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 Templates/partials/messages.html

diff --git a/Clientes/forms.py b/Clientes/forms.py
index 1cbb5ef..dd677e0 100644
--- a/Clientes/forms.py
+++ b/Clientes/forms.py
@@ -3,12 +3,24 @@ from .models import Clientes
 from datetime import datetime
 
 class ClienteForm(forms.ModelForm):
-    fecha_baja = forms.DateField(
+    
+    fecha_baja = forms.DateField(        
         required=False,
         initial=datetime.now(),
         input_formats=["%Y-%m-%d"],
         widget=forms.DateInput(attrs={'type':'date'},format="%Y-%m-%d")
     )
+    
+
     class Meta:
         model = Clientes
-        fields = ('RFC','Nombre','Activo','fecha_baja')
\ No newline at end of file
+        fields = ('RFC','Nombre','Activo','fecha_baja')
+
+    def clean(self):
+        super(ClienteForm,self).clean()
+        Activo = self.cleaned_data.get("Activo")
+        fecha_baja = self.cleaned_data.get("fecha_baja")
+        
+        if Activo and fecha_baja:
+            self._errors['fecha_baja'] = self.error_class(["El parametro activo no puede estar seleccionado si hay fecha de baja"])        
+        return self.cleaned_data
\ No newline at end of file
diff --git a/Clientes/models.py b/Clientes/models.py
index 548da89..a3cdede 100644
--- a/Clientes/models.py
+++ b/Clientes/models.py
@@ -37,7 +37,7 @@ class Clientes(models.Model):
     Nombre = models.CharField(max_length=100)
 
     
-    Activo = models.BooleanField(default=True)
+    Activo = models.BooleanField(default=False)
     fecha_baja = models.DateField(blank=True,null=True)
     
     @property
@@ -47,6 +47,6 @@ class Clientes(models.Model):
         year  = today.year        
         return Timbres.objects.filter(rfcc=self.RFC, created_at__year=str(year),created_at__month=str(month)).count()
     class Meta:
-        ordering = ('RFC',)
+        ordering = ('-Activo','RFC',)
         
 
diff --git a/Clientes/views.py b/Clientes/views.py
index 76537e5..8f1a422 100644
--- a/Clientes/views.py
+++ b/Clientes/views.py
@@ -91,8 +91,8 @@ def timbres_cliente(request, RFC):
     tipo = request.GET.get('tipo',None)
 
 
-    filters = {key:value for (key,value) in dict(request.GET).items() if value !=None}
-
+    filters = {key:value[0] for (key,value) in dict(request.GET).items() if value !=[""]}
+    filters.pop('page', '')
     if tipo:
         lista = lista.filter(Q(tipo__icontains=search))
 
@@ -113,12 +113,15 @@ def timbres_cliente(request, RFC):
 
     conteo = lista.count()
     perPage =  conteo // 2
+    if perPage == 0 :
+        perPage = conteo
     lista =pageFunc(page,lista,perPage)
-
+    
     context ={
         'lista':lista,
         'conteo':conteo,
-        'RFC':RFC
+        'RFC':RFC,
+        'filters':filters
     }
     return render(request, 'Clientes/timbres_cliente.html', context)
 
diff --git a/Templates/Clientes/edit_cliente.html b/Templates/Clientes/edit_cliente.html
index b0191e2..97f351b 100644
--- a/Templates/Clientes/edit_cliente.html
+++ b/Templates/Clientes/edit_cliente.html
@@ -11,13 +11,11 @@
         <div class="form-group">
             <label for="{{form.RFC.name}}"><strong> {{form.RFC.label|capfirst}} </strong></label>
             {% render_field form.RFC id+="add" id+=form.RFC.name  placeholder=form.RFC.label class="form-control"  type="text" autocomplete="off" %}    
-        </div>
-        
+        </div>        
         <div class="form-group">
             <label for="{{form.Nombre.name}}"><strong> {{form.Nombre.label|capfirst}} </strong></label>
             {% render_field form.Nombre id+="add" id+=form.Nombre.name  placeholder=form.Nombre.label class="form-control"  type="text" autocomplete="off" %}    
         </div>
-
         <div class="form-group form-check">
             {% render_field form.Activo class+="form-checkbox"  type="checkbox"  %}
           <label class="form-check-label" for="{{form.Activo.label}}">Activo</label>
@@ -32,6 +30,7 @@
 
 {% block scripts %}
 <script>
+    
     window.addEventListener("load", (event)=>{
         if(!id_Activo.checked){
             id_fecha_baja.setAttribute('required','')
diff --git a/Templates/Clientes/index.html b/Templates/Clientes/index.html
index d9e4475..35024ad 100644
--- a/Templates/Clientes/index.html
+++ b/Templates/Clientes/index.html
@@ -20,17 +20,27 @@ Timbres disponibles Comercio Digital: {{saldo.saldo}}
         </th>
         <th>Nombre</th>
         <th>Totales Mes {{fecha|date:"F"}}</th>
+        <th>Estado</th>
         <th scope="col">actions</th>
       </tr>
     </thead>
     <tbody>
       {% for obj in lista %}
-        <tr class="">
+        <tr class="{% if not obj.Activo %}table-danger{% endif %}">
             <td>
               <a href="{% url 'update_cliente' obj.pk %}">{{obj.RFC}}</a>              
             </td>
-            <td>{{obj.Nombre}}</td>
+            <td>{{obj.Nombre}} </td>
             <td>{{obj.timbres_mes_count}}</td>
+            
+            <td>
+              {% if obj.Activo %}
+                Activo
+              {% else %} 
+                Inactivo
+              {% endif %}
+            </td>
+          
             <td>              
                 {% if request.user.is_staff %}
                   <a  href="{% url 'timbres_cliente' obj.RFC %}" class="btn btn-info">Ver Timbres</a>
diff --git a/Templates/Clientes/timbres_cliente.html b/Templates/Clientes/timbres_cliente.html
index e49346f..0457f30 100644
--- a/Templates/Clientes/timbres_cliente.html
+++ b/Templates/Clientes/timbres_cliente.html
@@ -6,6 +6,15 @@
 {% block content %}
 <h1>Timbres <strong>{{RFC}}</strong> </h1>
 <h2>Timbres totales: <strong></strong>{{conteo}}</strong></h2>
+<span class="navbar-text mr-2">
+  {% if filters.datepicker%}
+  De fecha: <strong>"{{filters.datepicker}}"</strong>
+{% endif %}
+
+{% if filters.datepickerFin %}
+  A fecha: <strong>"{{filters.datepickerFin}}"</strong>
+{% endif %}
+</span>
 
 <br><br>
 
diff --git a/Templates/base.html b/Templates/base.html
index be38f1b..fa2e491 100644
--- a/Templates/base.html
+++ b/Templates/base.html
@@ -21,7 +21,9 @@
     <div class="container-fluid">
         {% include 'sidebar.html' %}
         <h1>{% block titlePage %}{% endblock titlePage %}</h1> 
+        {% include 'partials/messages.html' %}
         {% block content %}{% endblock content %}        
+        
         {% include 'paginator.html' %}  
     </div>
 
diff --git a/Templates/paginator.html b/Templates/paginator.html
index 3b80095..92e07d7 100644
--- a/Templates/paginator.html
+++ b/Templates/paginator.html
@@ -1,4 +1,6 @@
+
 {% if lista.has_other_pages %}
+
 <nav>
   <ul class="pagination justify-content-center">
     {% if lista.has_previous %}
@@ -17,7 +19,7 @@
       {% if lista.number == p %}
         <li class="page-item"><a class="page-link" style="color: red;" href="#">{{ p }}</a></li>
       {% else %}
-        <li class="page-item"><a class="page-link" href="?page={{ p }}">{{ p }}</a></li>
+        <li class="page-item"><a class="page-link" href="?page={{ p }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}">{{ p }}</a></li>
       {% endif %}
     {% endfor %}
 
diff --git a/Templates/partials/messages.html b/Templates/partials/messages.html
new file mode 100644
index 0000000..53bdcce
--- /dev/null
+++ b/Templates/partials/messages.html
@@ -0,0 +1,13 @@
+{% if form.errors %}
+    {% for field in form %}
+        {% for error in field.errors %}
+            <div class="alert alert-danger alert-dismissible fade show" role="alert">
+                <strong>-{{field.name}}</strong><br>
+                 <strong>{{ error|escape }}</strong> <br>                
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">                    
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div> 
+        {% endfor %}
+    {% endfor %}
+{% endif %}
\ No newline at end of file