update trainees page

This commit is contained in:
Ross
2023-11-13 13:45:00 +00:00
parent 6bb4b9ac34
commit 13b5d60ce6
2 changed files with 9 additions and 5 deletions
+2 -2
View File
@@ -7,7 +7,7 @@ from dal import autocomplete
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.forms.models import model_to_dict
from django.db.models.functions import Coalesce
from django.db.models.functions import Coalesce, Lower
from django.shortcuts import render, get_object_or_404, redirect
from django.contrib.auth.decorators import login_required, user_passes_test
@@ -3034,7 +3034,7 @@ def exam_inactive(request, context):
@user_is_cid_user_manager
def trainees(request, grade: None|str=None):
trainees = UserProfile.objects.filter(peninsula_trainee=True).order_by(Coalesce("grade__name", "user__last_name").asc())
trainees = UserProfile.objects.filter(peninsula_trainee=True, user__is_active=True).order_by("grade__name", Lower("user__last_name"))
if grade is not None:
trainees = trainees.filter(grade__name=grade)