From 34c03e379d2b2994cc32a604ae05681ecc21e09e Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sun, 30 Jan 2022 11:23:54 +0000
Subject: [PATCH] Switch to using competency assessed for leaderboard

---
 training/templates/trainee_list.html | 2 +-
 training/views.py                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/training/templates/trainee_list.html b/training/templates/trainee_list.html
index 7f023d6c..9b9ed881 100644
--- a/training/templates/trainee_list.html
+++ b/training/templates/trainee_list.html
@@ -40,7 +40,7 @@
                         <th>Van Driver?</th>
                         <th>Technician?</th>
                         <th>Supervisor?</th>
-                        <th>Qualification Count</th>
+                        <th>Competency Assessed Count</th>
                         <th></th>
                     </tr>
                 </thead>
diff --git a/training/views.py b/training/views.py
index c979efad..48bf17a3 100644
--- a/training/views.py
+++ b/training/views.py
@@ -111,7 +111,7 @@ class TraineeList(generic.ListView):
         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')
+        return self.model.objects.filter(filt).annotate(num_qualifications=Count('qualifications_obtained', filter=Q(qualifications_obtained__depth=models.TrainingItemQualification.PASSED_OUT))).order_by('-num_qualifications').prefetch_related('level_qualifications', 'qualifications_obtained', 'qualifications_obtained__item')
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)