diff --git a/ephios/core/templatetags/user_extras.py b/ephios/core/templatetags/user_extras.py index 270a4808f..e09ac6ba5 100644 --- a/ephios/core/templatetags/user_extras.py +++ b/ephios/core/templatetags/user_extras.py @@ -38,7 +38,7 @@ def get_relevant_qualifications(qualification_queryset): global_preferences = global_preferences_registry.manager() qs = qualification_queryset.filter( category__in=global_preferences["general__relevant_qualification_categories"] - ) + ).order_by("category", "abbreviation") return qs.values_list("abbreviation", flat=True) diff --git a/ephios/core/views/accounts.py b/ephios/core/views/accounts.py index fb0291cd7..b7a7f255c 100644 --- a/ephios/core/views/accounts.py +++ b/ephios/core/views/accounts.py @@ -57,7 +57,7 @@ def get_queryset(self): to_attr=f"qualifications_for_category_{category.pk}", ) ) - return qs + return qs.order_by("last_name", "first_name") class UserProfileCreateView(CustomPermissionRequiredMixin, TemplateView): diff --git a/ephios/plugins/basesignup/signup/common.py b/ephios/plugins/basesignup/signup/common.py index d5b18f008..571a06b0a 100644 --- a/ephios/plugins/basesignup/signup/common.py +++ b/ephios/plugins/basesignup/signup/common.py @@ -114,7 +114,9 @@ def get_participation_display(self): ", ".join( participant.qualifications.filter( category__in=relevant_qualification_categories - ).values_list("title", flat=True) + ) + .order_by("category", "title") + .values_list("title", flat=True) ), ] for participant in self.shift.get_participants() diff --git a/ephios/plugins/basesignup/signup/section_based.py b/ephios/plugins/basesignup/signup/section_based.py index a99000858..2d3ddbc5a 100644 --- a/ephios/plugins/basesignup/signup/section_based.py +++ b/ephios/plugins/basesignup/signup/section_based.py @@ -275,7 +275,9 @@ def _get_sections_with_users(self): "relevant_qualifications": ", ".join( participation.participant.qualifications.filter( category__in=relevant_qualification_categories - ).values_list("abbreviation", flat=True) + ) + .order_by("category", "abbreviation") + .values_list("abbreviation", flat=True) ), "uuid": dispatched_section_uuid, }