From 3e2022f3533f75355f64e3bb8dfcc162f6b55afe Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Wed, 24 Jan 2024 00:18:05 +0000
Subject: [PATCH] add order to jobs sidebar

---
 fet2020/members/templatetags/job_groups.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fet2020/members/templatetags/job_groups.py b/fet2020/members/templatetags/job_groups.py
index f8529564..907bbf12 100644
--- a/fet2020/members/templatetags/job_groups.py
+++ b/fet2020/members/templatetags/job_groups.py
@@ -1,6 +1,7 @@
 from collections import deque
 
 from django import template
+from django.db.models import F
 
 from members.models import JobMember, JobGroup
 
@@ -17,7 +18,9 @@ def get_jobs_sidebar(slug):
         if not job_members:
             job_groups.remove(elem)
 
-    job_members = JobMember.active_member.get_all(slug=slug)
+    job_members = JobMember.active_member.get_all(slug=slug).order_by(
+        F("job__order").asc(nulls_last=True), "job__name"
+    )
     active_job_group = JobGroup.objects.filter(slug=slug).first()
 
     context = {