diff --git a/fet2020/members/managers.py b/fet2020/members/managers.py index 073ed7c7..f7c6cae4 100644 --- a/fet2020/members/managers.py +++ b/fet2020/members/managers.py @@ -50,6 +50,20 @@ class JobMemberManager(models.Manager): return qs.filter(Q(member__role=role)) + 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") + + 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") + + return qs.filter( + Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False) + ) + class JobGroupManager(models.Manager): def get_pinned_jobgroups(self): diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 7525e44e..0cc586ac 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -107,13 +107,15 @@ def profile_view(request, member_id=None): logger.info("Wrong member id '{}'".format(member_id)) raise Http404("no member") - jobs = deque(JobMember.members.filter(member__id=member_id).order_by("job_start")) + active_jobs = deque(JobMember.members.get_active_jobs(member_id)) + inactive_jobs = deque(JobMember.members.get_inactive_jobs(member_id)) context = { "pinned_job_groups": pinned_job_groups, "unpinned_job_groups": unpinned_job_groups, "member": member, - "jobs": jobs, + "active_jobs": active_jobs, + "inactive_jobs": inactive_jobs, } return render(request, "members/member.html", context) diff --git a/fet2020/templates/members/partials/_member_details.html b/fet2020/templates/members/partials/_member_details.html index c3c8bc6f..4bbf6c0a 100644 --- a/fet2020/templates/members/partials/_member_details.html +++ b/fet2020/templates/members/partials/_member_details.html @@ -14,7 +14,7 @@
{{ member.description|softhyphen|safe }}
- {% if jobs %} + {% if active_jobs or inactive_jobs %}

Ehrenamtliche Tätigkeiten: