Ajout d'un filtre sur l'utilisateur dans la recherche

search/models.py

@@ -6,6 +6,14 @@ from django.forms import ModelForm
 from users.models import User
 # Create your models here.
 
-class SearchForm(Form):
-    search_field = forms.CharField(label = 'Search', max_length = 100)
+CHOICES = (
+    ('0', 'Actifs'),
+    ('1', 'Désactivés'),
+    ('2', 'Archivés'),
+)
 
+class SearchForm(Form):
+    search_field = forms.CharField(label = 'Search', max_length = 100, required=False)
+    filtre = forms.MultipleChoiceField(label="Filtre utilisateur", required=False, widget =forms.CheckboxSelectMultiple,choices=CHOICES)
+    date_deb = forms.DateField(required=False, label="Date de début", help_text='DD/MM/YYYY', input_formats=['%d/%m/%Y'])
+    date_fin = forms.DateField(required=False, help_text='DD/MM/YYYY', input_formats=['%d/%m/%Y'], label="Date de fin")

search/views.py

@@ -22,8 +22,12 @@ def search(request):
     if request.method == 'POST':
         search = SearchForm(request.POST or None)
         if search.is_valid():
+            states = search.cleaned_data['filtre']
             search = search.cleaned_data['search_field']
-            users = User.objects.filter(Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search))
+            query = Q() 
+            for s in states:
+                query = query | Q(state = s)
+            users = User.objects.filter((Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search)) & query)
             connexion = []
             for user in users:
                 connexion.append([user, has_access(user)])