sorted jobs in member profile

This commit is contained in:
2023-01-12 11:18:57 +00:00
parent 5b52470f87
commit a04e4018c8
2 changed files with 10 additions and 1 deletions

View File

@@ -35,6 +35,9 @@ class JobOverviewInline(JobMemberInline):
verbose_name = "Tätigkeit" verbose_name = "Tätigkeit"
verbose_name_plural = "Tätigkeitsübersicht" verbose_name_plural = "Tätigkeitsübersicht"
def get_queryset(self, request):
return JobMember.members.get_all_jobs_sorted()
class ActiveMemberInline(JobMemberInline): class ActiveMemberInline(JobMemberInline):
form = ActiveMemberForm form = ActiveMemberForm

View File

@@ -1,7 +1,7 @@
from datetime import timedelta from datetime import timedelta
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import F, Q
from django.utils import timezone from django.utils import timezone
@@ -58,6 +58,12 @@ class JobMemberManager(models.Manager):
return qs.filter(Q(member__role=role)) return qs.filter(Q(member__role=role))
def get_all_jobs_sorted(self):
qs = self.get_queryset().order_by(
F("job_end").desc(nulls_first=True), "-job_start", "job__name"
)
return qs
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 = ( qs = (