Merge branch 'master' into 945-feature-email-ifm-invitation-skal-være…

…-flexibel-ligesom-ved-sletning-fra-venteliste

members/admin/activity_admin.py

@@ -17,13 +17,13 @@ class ActivityParticipantInline(admin.TabularInline):
         "person",
         "note",
         "photo_permission",
-        "payment_info_text",
+        "payment_info_html",
     )
     readonly_fields = fields
     can_delete = False
 
     def get_queryset(self, request):
-        return ActivityParticipant.objects.all()
+        return ActivityParticipant.objects.all().order_by("person")
 
 
 class ActivityUnionListFilter(admin.SimpleListFilter):

members/admin/activityinvite_admin.py

@@ -137,6 +137,7 @@ def get_form(self, request, obj=None, change=False, **kwargs):
         "invite_dtm",
         "expire_dtm",
         "rejected_at",
+        "participating",
     )
     list_filter = (
         ActivityInviteUnionListFilter,
@@ -244,3 +245,12 @@ def person_link(self, item):
 
     person_link.short_description = "Person"
     person_link.admin_order_field = "person__name"
+
+    def participating(self, item):
+        return (
+            item.person.activityparticipant_set.filter(activity=item.activity).count()
+            > 0
+        )
+
+    participating.short_description = "Deltager"
+    participating.boolean = True

members/models/activityparticipant.py

@@ -61,6 +61,11 @@ def payment_info_text(self):
 
     payment_info_text.short_description = "Betalingsinfo"
 
+    def payment_info_html(self):
+        return self.payment_info(True)
+
+    payment_info_html.short_description = "Betalingsinfo"
+
     def payment_info(self, format_as_html: bool):
         if format_as_html:
             html_error_pre = "<span style='color:red'><b>"
@@ -77,7 +82,11 @@ def payment_info(self, format_as_html: bool):
 
         # Checking for price = 0 before checking for payment
         if self.activity.price_in_dkk == 0:
-            return f"{html_good_pre}Gratis.{html_post} "
+            result_string = f"{html_good_pre}Gratis.{html_post} "
+            if format_as_html:
+                return format_html(result_string)
+            else:
+                return result_string
 
         try:
             payment = members.models.payment.Payment.objects.get(