From 7bc47b446cfd790f71ed05954fb757a8a9b06ecb Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Tue, 25 Jan 2022 10:53:25 +0000 Subject: [PATCH] Add functionality to filter trainee list by is_supervisor Closes #479 --- training/templates/trainee_list.html | 12 +++++++++++- training/views.py | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/training/templates/trainee_list.html b/training/templates/trainee_list.html index cfefeafc..6cfccb9a 100644 --- a/training/templates/trainee_list.html +++ b/training/templates/trainee_list.html @@ -16,7 +16,17 @@ {% endblock %} {% block content %} -{% include 'partials/list_search.html' %} +
+ {% csrf_token %} +
+ + {% button 'search' id="id_search" %} +
+ +
diff --git a/training/views.py b/training/views.py index c59f2965..509df3fa 100644 --- a/training/views.py +++ b/training/views.py @@ -108,6 +108,9 @@ class TraineeList(generic.ListView): # not an integer pass + if self.request.GET.get('is_supervisor', ''): + filt = filt & Q(is_supervisor=True) + return self.model.objects.filter(filt).annotate(num_qualifications=Count('qualifications_obtained')).order_by('-num_qualifications').prefetch_related('level_qualifications', 'qualifications_obtained', 'qualifications_obtained__item') def get_context_data(self, **kwargs):