bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jobs in profile, order by job name

Browse Source
This commit is contained in:
Patrick Mayr
2023-01-12 00:53:11 +00:00
parent a44fc0bfcb
commit 3b9be918bf
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fet2020/members/managers.py
View File

@@ -52,13 +52,21 @@ class JobMemberManager(models.Manager):
def get_active_jobs(self, member_id): def get_active_jobs(self, member_id):
date_today = timezone.now().date() 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)) return qs.filter(Q(job_end__gt=date_today) | Q(job_end__isnull=True))
def get_inactive_jobs(self, member_id): def get_inactive_jobs(self, member_id):
date_today = timezone.now().date() 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( return qs.filter(
Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False) Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False)