Merge pull request #849 from lakridserne/feature/776_refactor_members…

…_table

Introducer feltet person på aktivitetstilmeldingen, så vi ved hvem der er tilmeldt - erstatter member

members/management/commands/populate_person_field_on_activityparticipants.py

@@ -0,0 +1,11 @@
+from django.core.management.base import BaseCommand
+from members.models.activityparticipant import ActivityParticipant
+
+
+class Command(BaseCommand):
+    help = "Populates the person field on the activity participants table, so we can remove member in the future"
+
+    def handle(self, *args, **options):
+        for actpar in ActivityParticipant.objects.all():
+            actpar.person = actpar.member.person
+            actpar.save()

members/migrations/0037_activityparticipant_person.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.6 on 2023-02-26 13:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0036_rename_founded_union_founded_at_union_closed_at"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="activityparticipant",
+            name="person",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="members.person",
+                verbose_name="Person",
+            ),
+        ),
+    ]

members/migrations/0038_merge_20230226_1633.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.1.6 on 2023-02-26 15:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0037_activityparticipant_person"),
+        ("members", "0037_alter_waitinglist_options"),
+    ]
+
+    operations = []

members/models/activityparticipant.py

@@ -25,6 +25,9 @@ class Meta:
     member = models.ForeignKey(
         "Member", on_delete=models.CASCADE, verbose_name="Medlem"
     )
+    person = models.ForeignKey(
+        "Person", on_delete=models.CASCADE, verbose_name="Person", null=True
+    )
     note = models.TextField("Besked / Note til arrangement", blank=True)
     PHOTO_OK = "OK"
     PHOTO_NOTOK = "NO"

members/views/ActivitySignup.py

@@ -111,11 +111,7 @@ def ActivitySignup(request, activity_id, person_id=None):
 
         if not (activity.min_age <= person.age_years() <= activity.max_age):
             return HttpResponse(
-                "Barnet skal være mellem "
-                + str(activity.min_age)
-                + " og "
-                + str(activity.max_age)
-                + " år gammel for at deltage. (Er fødselsdatoen udfyldt korrekt ?)"
+                f"Barnet skal være mellem {activity.min_age} og {activity.max_age} år gammel for at deltage. (Er fødselsdatoen udfyldt korrekt ?)"
             )
 
         if (
@@ -157,8 +153,12 @@ def ActivitySignup(request, activity_id, person_id=None):
             member.save()
 
             # Make ActivityParticipant
+            # Note: The members field is now deprecated and is expected to be removed in a future release
             participant = ActivityParticipant(
-                member=member, activity=activity, note=signup_form.cleaned_data["note"]
+                member=member,
+                person=person,
+                activity=activity,
+                note=signup_form.cleaned_data["note"],
             )
 
             # If conditions not accepted, make error
@@ -178,7 +178,7 @@ def ActivitySignup(request, activity_id, person_id=None):
             )
 
             # Make payment if activity costs
-            if activity.price_in_dkk is not None and activity.price_in_dkk != 0:
+            if activity.price_in_dkk is not None and activity.price_in_dkk > 0:
                 # using creditcard ?
                 if signup_form.cleaned_data["payment_option"] == Payment.CREDITCARD:
                     payment = Payment(