Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Admin > Invtationer: Sortering af Alder, PostNummer og Deltager kolonner #1081

Merged
merged 2 commits into from
Jul 21, 2024
Merged

Admin > Invtationer: Sortering af Alder, PostNummer og Deltager kolonner #1081

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b891d04
Admin > Invtationer: Sortering af Alder, PostNummer og Deltager kolon…
mhewel Jul 21, 2024
c1b7677
Merge branch 'master' into 1079-feature-admin-invitationer-sorter-på-…
rasmusselsmark Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions members/admin/activityinvite_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
from django.utils import timezone
from django.utils.safestring import mark_safe
from django.utils.html import escape
from django.db.models import Exists, OuterRef

from members.models import (
Activity,
ActivityInvite,
ActivityParticipant,
AdminUserInformation,
Department,
Person,
Expand Down Expand Up @@ -165,7 +167,15 @@ class Meta:

# Only show invitation to own activities
def get_queryset(self, request):
qs = super(ActivityInviteAdmin, self).get_queryset(request)
queryset = super().get_queryset(request)
qs = queryset.annotate(
is_participating=Exists(
ActivityParticipant.objects.filter(
person=OuterRef("person"), activity=OuterRef("activity")
)
)
)

if request.user.is_superuser or request.user.has_perm(
"members.view_all_departments"
):
Expand Down Expand Up @@ -211,11 +221,13 @@ def person_age_years(self, item):
return item.person.age_years()

person_age_years.short_description = "Alder"
person_age_years.admin_order_field = "person__birthday"

def person_zipcode(self, item):
return item.person.zipcode

person_zipcode.short_description = "Postnummer"
person_zipcode.admin_order_field = "person__zipcode"

def activity_department_union_link(self, item):
url = reverse(
Expand Down Expand Up @@ -259,12 +271,11 @@ def person_link(self, item):
person_link.admin_order_field = "person__name"

def participating(self, item):
return item.person.activityparticipant_set.filter(
activity=item.activity
).exists()
return item.is_participating

participating.short_description = "Deltager"
participating.boolean = True
participating.admin_order_field = "is_participating"

def export_csv_invitation_info(self, request, queryset):
result_string = """"Forening"; "Afdeling"; "Aktivitet"; "Deltager";\
Expand Down
Loading