Switch to using competency assessed for leaderboard

This commit is contained in:
2022-01-30 11:23:54 +00:00
parent 988fb78b45
commit 34c03e379d
2 changed files with 2 additions and 2 deletions

View File

@@ -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>

View File

@@ -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)