From 3b9be918bfd1aec9306b6ac00cef28380273d7b2 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Thu, 12 Jan 2023 00:53:11 +0000 Subject: [PATCH] jobs in profile, order by job name --- fet2020/members/managers.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fet2020/members/managers.py b/fet2020/members/managers.py index a0b4b397..a3fb6106 100644 --- a/fet2020/members/managers.py +++ b/fet2020/members/managers.py @@ -52,13 +52,21 @@ class JobMemberManager(models.Manager): def get_active_jobs(self, member_id): date_today = timezone.now().date() - qs = self.get_queryset().filter(member__id=member_id).order_by("-job_start") + qs = ( + self.get_queryset() + .filter(member__id=member_id) + .order_by("-job_start", "job__name") + ) return qs.filter(Q(job_end__gt=date_today) | Q(job_end__isnull=True)) def get_inactive_jobs(self, member_id): date_today = timezone.now().date() - qs = self.get_queryset().filter(member__id=member_id).order_by("-job_start") + qs = ( + self.get_queryset() + .filter(member__id=member_id) + .order_by("-job_start", "job__name") + ) return qs.filter( Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False)